More debug message tweaking