Render improvements