Minor fixes to debug outputs