Minor fixes to debug output