Fixes to the fixes