Misc output improvements