Minor output cleanups