Renderer improvements