[DF-1785] Fixed double validator. Minor fixes.