Fixed issues with rebase of history.