Changes for GCC 3.1