Rendering fixes from 2.1