Small general tweaks to output