clean C++11 issues