Encoding syntax fixes