Small fixes to debugging outputs