Fix design regressions.