Fixing issues with rebasing