Fix syntax errors in master got in the last merge