Fixes for older GCC.