Misc fixes to output