More C++11 changes