Attempting to fix the build for OS X