Minor output tweaks