Fixed regressions that failed on CI