Fix rebase stuff