diff --git a/DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx b/DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
index 9653eb67aad080822c7354fbc2229a64693f0b1c..59d81a8d8006bdde022b1db76092a6f97567e85e 100644
--- a/DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
+++ b/DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
@@ -42,9 +42,9 @@ FaserDetectorID::FaserDetectorID()
         m_CALO_ID(4),
         m_EMULSION_ID(1),
         m_VETO_ID(1),
+    	m_VETONU_ID(4),
         m_TRIGGER_ID(2),
         m_PRESHOWER_ID(3),
-	m_VETONU_ID(4),
         m_SCT_ID(1),
         m_ECAL_ID(1),
         m_isSLHC(false),
@@ -78,9 +78,9 @@ FaserDetectorID::FaserDetectorID(const FaserDetectorID& other)
         m_CALO_ID                 (other.m_CALO_ID),
         m_EMULSION_ID             (other.m_EMULSION_ID),
         m_VETO_ID                 (other.m_VETO_ID),
+        m_VETONU_ID               (other.m_VETONU_ID),
         m_TRIGGER_ID              (other.m_TRIGGER_ID),
         m_PRESHOWER_ID            (other.m_PRESHOWER_ID),
-        m_VETONU_ID               (other.m_VETONU_ID),
         m_SCT_ID                  (other.m_SCT_ID),
         m_ECAL_ID                 (other.m_ECAL_ID),
         m_isSLHC                  (other.m_isSLHC),
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
index 2086d60b12f50e223aa3bf0f0230ca8717aee6c7..38a8976dafe047cce2da022e6e1cee2267ef2aad 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
@@ -8,17 +8,17 @@ atlas_subdir( FaserGeoModel )
 
 if (INSTALL_GEOMDB)
 add_custom_command (
-   OUTPUT ${CMAKE_BINARY_DIR}/data/geomDB_sqlite
+   OUTPUT ${CMAKE_BINARY_DIR}/data/geomDB/geomDB_sqlite
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/geomDB.sql
-   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/data
-   COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/data/geomDB.sql | sqlite3 ${CMAKE_BINARY_DIR}/data/geomDB_sqlite
+   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/data/geomDB
+   COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/data/geomDB.sql | sqlite3 ${CMAKE_BINARY_DIR}/data/geomDB/geomDB_sqlite
    )
 
-   add_custom_target( geomDB ALL DEPENDS ${CMAKE_BINARY_DIR}/data/geomDB_sqlite )
+   add_custom_target( geomDB ALL DEPENDS ${CMAKE_BINARY_DIR}/data/geomDB/geomDB_sqlite )
 
    # Install the generated file:
-   install( FILES ${CMAKE_BINARY_DIR}/data/geomDB_sqlite
-            DESTINATION ${CMAKE_INSTALL_DATADIR} )
+   install( FILES ${CMAKE_BINARY_DIR}/data/geomDB/geomDB_sqlite
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/geomDB/ )
 endif()
 
 # Install python files from the package:
diff --git a/README.md b/README.md
index 0b334b19690dd56d1a0bae23fd5c0849c1cd83dd..72e2334565dca70d7791acc6a6fccba9e9908295 100644
--- a/README.md
+++ b/README.md
@@ -52,4 +52,4 @@ When compiling, CERN IT recommends using condor to submit batch jobs. The basics
 
 ** `ConfigFlags.GeoModel.FaserVersion = "FASER-TB00"` and `ConfigFlags.IOVDb.GlobalTag = OFLCOND-FASER-TB00` enables the 2021 Test-beam setup.
 
-* The command `lsetup "lcgenv -p LCG_98python3_ATLAS_8 x86_64-centos7-gcc8-opt sqlite"` may be necessary to avoid errors when generating a database
+* The command `source /cvmfs/sft.cern.ch/lcg/releases/LCG_101_ATLAS_6/sqlite/3320300/x86_64-centos7-gcc11-opt/sqlite-env.sh` may be necessary to avoid errors when generating a database
diff --git a/Scintillator/ScintSimEvent/src/ScintHitIdHelper.cxx b/Scintillator/ScintSimEvent/src/ScintHitIdHelper.cxx
index 5f115d47109690e545267e6cbc561fc5b8e7afdf..12cec61e319f4abb89e89b2fac16734a4984fd14 100644
--- a/Scintillator/ScintSimEvent/src/ScintHitIdHelper.cxx
+++ b/Scintillator/ScintSimEvent/src/ScintHitIdHelper.cxx
@@ -40,7 +40,6 @@ void ScintHitIdHelper::Initialize() {
   // determine whether hits were created with an SLHC dictionary
   // in which case eta module field is expanded.
   // Need to lock this thread-unsafe retrieval
-  const VetoID* pix;
   ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "ScitHitIdHelper");
   if (detStore.retrieve().isSuccess()) {
     if (detStore->retrieve(m_vetoID, "VetoID").isFailure()) { m_vetoID = 0; }