Fix more custom crap