Some more rendering fixes