Trying to fix gcc compilation problems