Fixes for GCC build.