Possible build fix for c++11 stuff