- Fix gcc compilation issues