Fixed various regressions