Some fixes for non-GNU standard C++ library.