[DF-1004] Fix MacOS compilation errors