variety of syntax fixes