Fixed a few regressions