fixes to the fixes