few clang warnings fixed