Fix more crap