Some more rendering changes