Further GCC adaptation