fixes from libsodium for XCode5 merged