Advanced Rendering fixes