Fix build issues on MacOS

Merged Ammar Nejati requested to merge fixBuild into main

Merge request reports