Cleanup some rebase errors