Get rendering back to parity with master