fxes for C++11 part