More fixes to fix fixes and new fixes to fix stuff.