Changes that remove the need for a C++11 compiler