A couple of fixes for new rendering code.