C++11 style fixes