Removed some of the clang warnings.