A few syntactic changes