Fixes for geant