[DF-1970] Fix MacOS compilation errors after review fixes