Improve some debug messages