Fixed a minor rebase issues.