A few small fixes to output