fixup! fixup! Build with C++11