Tweaks to rendering