Minor syntactical updates