diff --git a/NPLib/IORoot/RootOutput.cxx b/NPLib/IORoot/RootOutput.cxx
index 54f558898ef60621ab561e6175df4c88324b0cca..d383613869f7550ce7ff914d9a5ce51b5dd4ded8 100644
--- a/NPLib/IORoot/RootOutput.cxx
+++ b/NPLib/IORoot/RootOutput.cxx
@@ -126,7 +126,6 @@ RootOutput::~RootOutput()
 {
     // The data is written to the file and the tree is closed:
     if (pRootFile && !NPOptionManager::getInstance()->GetPROOF()) {
-      pRootFile->cd();
       cout << endl;
       cout << "Got histograms and Tree !" << endl;
       cout << "  - Number of entries in the Tree: " << pRootTree->GetEntries() << endl;
diff --git a/NPSimulation/Makefile.geant4 b/NPSimulation/Makefile.geant4
index f1327d3472bca05e358dbb73048d367796b301fc..962fd478817c7e6767239e4900432b30d235866d 100644
--- a/NPSimulation/Makefile.geant4
+++ b/NPSimulation/Makefile.geant4
@@ -23,7 +23,7 @@ endif
 G4WORKDIR = ./
 G4BIN = ./bin
 
-CPPFLAGS += $(shell root-config --cflags) 
+CPPFLAGS += $(shell root-config --cflags)
 CPPFLAGS += -I$(NPTOOL)/NPLib/include
 
 ifeq ($(ARCH),linuxx8664gcc)