Fixing compiler warnings.

I'd like to get this pulled in because this is a submodule of a larger iOS library that I'm making MacOS compatible.