more rebase fixes