Improve pythia1compat