Fix C++11 language violations