Fix syntax after a rebase