Fix misc mac issues

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/fix-misc-mac-issues into master

Created by: chuckatkins

@guj @eisenhauer this should fix your mac build issues

Merge request reports