Translation and syntax fixes