Some minor changes for Renderer class