More gcc compilation issues fixed