Fixed some issues with rebase