Many syntax fixes