Fixes for GCC 4.3.