Added some syntax fixes