Minor tweaks to renderer