diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
index 51c3615d86446e2207fa8cfbbb5ec3a2bf63c6f1..8dbe5940ab2cf7651e5e73fb4e278bb3e782392d 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
@@ -16,6 +16,8 @@ atlas_depends_on_subdirs( PRIVATE
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           DetectorDescription/GeoModel/GeoModelUtilities
                           DetectorDescription/GeoModel/GeoModelFaserUtilities
+                          DetectorDescription/GeoModel/GeoModelDBManager
+                          DetectorDescription/GeoModel/GeoWrite
                           Event/EventInfo
                           Event/EventInfoMgt
                           GaudiKernel )
@@ -34,7 +36,7 @@ atlas_add_component( GeoModelSvc
                      src/RDBMaterialManager.cxx
                      src/components/GeoModelSvc_entries.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CxxUtils AthenaKernel SGTools StoreGateLib SGtests GeoModelUtilities GeoModelFaserUtilities EventInfo GaudiKernel )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CxxUtils AthenaKernel SGTools StoreGateLib SGtests GeoModelUtilities GeoModelFaserUtilities GeoModelDBManager GeoWrite EventInfo GaudiKernel )
 
 # Install files from the package:
 atlas_install_headers( GeoModelSvc )
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
index 64aaed74d9c27aa3dcf23b5e79e15db909d2a152..d95cd7e5a201da4b6e433d078a08b577dc6ebec5 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
@@ -8,6 +8,9 @@
 #include "GeoModelKernel/GeoMaterial.h" 
 #include "GeoModelKernel/GeoVolumeCursor.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
+#include "GeoModelDBManager/GMDBManager.h"
+#include "GeoWrite/DumpGeoModelActionLocal.h"
+
 #include "GeoModelSvc.h"
 #include "RDBMaterialManager.h"
 #include "GeoDbTagSvc.h"
@@ -354,7 +357,17 @@ StatusCode GeoModelSvc::geoInit()
   rdbAccess->shutdown("FASERDD");
   if(m_printMaterials)
     theMaterialManager->printAll();
-  
+
+  // Try to dump the geometry
+  PVConstLink world(worldPhys);
+  GMDBManager db("faserGeo.db");
+  if (db.isOpen())
+  {
+    DumpGeoModelActionLocal dumpGraph(db);
+    world->exec(&dumpGraph);
+    dumpGraph.saveToDB();
+  }
+
   return StatusCode::SUCCESS;
 }
 
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx b/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
index 9fa68d1916a60e9c42bb1ee8952f5a63f4ba86d7..7c48dcb65312150d1e33b7854b1343bd5bc450ba 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
@@ -69,7 +69,7 @@ VetoStation::preBuild()
 {
   // Create the station volume
   // Box envelope containing the station.
-  const GeoBox* stationEnvelopeShape = new GeoBox(0.5 * m_thickness, 0.5 * m_width, 0.5 * m_length);
+  const GeoBox* stationEnvelopeShape = new GeoBox(0.5 * m_width, 0.5 * m_length, 0.5 * m_thickness);
   GeoLogVol* stationLog = new GeoLogVol(getName(), stationEnvelopeShape, m_materials->gasMaterial());
   return stationLog;
 //   const GeoTube * barrelEnvelopeShape = new GeoTube(m_innerRadius, m_outerRadius, 0.5 * m_length);