Minor output format tweaks