Fix g++ build