Regressions fixes + slight improvements