Fixed more crap