Rendering fixes!