fixes for C++ 11