Macos fixes

Merged Patric Schmitz requested to merge macos-fixes into develop

Merge request reports