DF#QCADOOCLS-1681 some fixes in samples