Small tweaks to the debug messages