Fix issues related to c++11