fix minor syntax errors
Merge branch 'identity' into util