More C++11 fixings.