Resolved some of clang warnings.