Minor tweaks to output