Fixes for GCC builds.