macOS fixes

Oleksandr Zenaievrequested to merge
pr/fix_ub into master

Fixes by Dmitry Kalinkin (checked by Ivan and Sasha Z.)

Merge request reports