DF-2765 some smal fixes