Fixes for pre-C++11 builds.