Fixed the fixes that needed fixing