Correct Rebase issues