[DF-2882] Small fixes