Fixing C++11 correctness