Next engine revision (Raptor 3) should help, as it is much simplified and quite less likely to leak or get damaged during flight.