Rendering fixes
Rendering madness