Fix a few things introduced by the rebase