Fixed regressions in master