A few syntax changes