Fix page flow regressions.