Stupid fixes, mostly scraps of debug code being removed