DF-2765 a lot of small fixes