Fixed GCC 4.7 build and removed C++11 specific code