Fixed #897: HWLOC causes failures on Mac
Fixing clang compilation problems