Corrections for C++11 Correctness