[DF-1478] and [DF-1479] fixes.