[DF-3732] Small fixes