WIP rendering fixes