Tweaks to renderer