Fix up more of the rendering stuff for 1.5