Fixes: Improve compatibility of 64-bit support for OS X
