Fixes a few view state regressions and failing tests.