c++11 style fixes