[DF-185] Compilation errors fixes