[DF-185] Small fixes