Fix compile with new GCC