More rendering fixes