Two fixes for compatibility with latest Clang/LLVM compiler and C++11