Fixed problems with rebase.