Fixed some rebase errors