[DF-185] Fix: compilation errors