Slightly improve some debug messages