Tweaks to output