Syntactical fixes