Fixups after rebase