fix rebase regressions