Small fixes to remove some compiler warning in clang/LLVM