A few more fixes to fix an error condition with debug messages, which I still haven't figured out how to turn off