Fixes to the fixes.