[DF-2688] Fixes for macos compiler