Clean up debug messages a bit