Fix various regressions