Minor improvements to output