Small fixes to the diagnostic output.