Fixing more broken fixes