Fixing more crap