DF-2765 some fixes