various syntax fixes