Add back accidentally removed flags for C++11