Changes to compile with GCC 2.96