Better support  for gcc.