DF-2765 loading and some small fixes