Fix for C++11 as default