clang pre-C++11 fixes