Additional syntax fixes