More syntax fixing