fix darwin and arm specifics II.