MacOS build fixes

Merged Jørgen Lind requested to merge feature/jorgen/build_fixes into master

Merge request reports