Resolved some clang warnings