[DF-4456] More fixes after review