Fix RSC regressions (#4076)