[DF-5514] Fixes after review