Update to handle latest Mac OS