Cosmetic fixes to output