Fixed rebase issues