Additional C++11 fixes.