DF-4250 fixes after review