Remove some C++11 features for gcc