C++11 Fixes.