Further render pass refinement. Fix safe not restoring overrides after render.