Fix the fixes