Minor tweaks to rendering