Fixes for GCC 3.2.