Fixes for GCC.