Better GCC support