Fix rebase errors 2