fixes for C++10 standard