Update for xCode 8.1