Some more clang warnings corrected