some fixes to the fixes