CLANG warning fixes.