Fixed regressions
Fixed multiple bugs