Fix some serious fuckups