Add OSX natives and OSX fix