Fixed some regressions