[TIDOC-1971] Fix syntax issues