Fix rebase errors