GCC support changes