DF-4536 fixes on review