fix missing upstream changes to syntax