Geant4 10 comp

Fixed remaining compillation problems for Geant4 10.0