Fixed some git rebase screwups