Add the rest of the fixes back in