Fixed a lot of regressions