Fixup some debug messages