Hopefully finished GCC compatibility