Fix some regressions.