Fix some crap