Fixup after rebase