Fixing non-c++11 compliant support.