More Rendering fixes.