Some rebase cleanup