Fixing more broken stuff