fixes for clang cpp11