Minor fixes to output