DF-4351 fixes on review