Fix more for c++11.