[DF-2857] Fixed compilation errors