Fix renderer regressions

Fixes the regressions @ScottNZ found in #3457.