Fix some lost code during rebase