Misc output changes.