A few syntaxic modifications