Fix xctool upgrade