Add mac and fix xctool