Fixes to align with the split-rendering solution