More C++11 fixes. More.