Minor modifications to debug messages