Fixed 3 of the 4 regressions