Fixed bootstrapper for mac