Fix some syntactical oddities