some additional syntax fixes