More to fix pre-c++2011 build