Fixing rebase issues