[DF-185] compilation fixes