[DF-4476] MacOS compilation fixes
[DF-4476] Review fixes