Some updates to handle correctly the Geant4 env flags

No match.