Fixed some regressions.