Fix some issues with rebase.