Tweaks to the new renderer