Some updates to handle the Geant4 env flags needed because of Flugg

No match.