[TIDOC-1062] Few corrections