OSX64 fixes