Rendering fixes