Rendering fix
Rendering fixes