More syntactical fixes