Tweaks to render pipeline