Few syntax fixes again