Fix problems with USE_CXX11