Tweak some debug messages