fix some c++11 errors