Revised C++11 fixes