Fixes for GCC 4.4.