A few syntactical updates