Fix syntax ambiguities