Minor fixes to turn off debug stuff