Added some fixes to the renderers.