fixups after rebase