Corrects xctool build issues.