Fix several regressions