Fix clang warnings.
OSX build work in progress.