More debug message improvements