Update to build with c++11