Small changes to syntax etc