Make it compile with g++ again