Fixed GCC builds