Several syntax changes