[DF-3978] small fixes after review