[TIDOC-1897] Syntax fixes