Make more compatible with GCC 2.96