[DF-4456] Fixes after review