Fixing GCC build