Tweaks to shell output