[DF-2865] Fix MacOS compilation errors