diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7b2a36..7db67ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@
 cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 project(musrSim)
 
-#set(CMAKE_CXX_STANDARD 17)
-#set(CMAKE_CXX_STANDARD_REQUIRED ON)
-#set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 #----------------------------------------------------------------------------
 # KAMIL CHANGES:
diff --git a/src/F04ElementField.cc b/src/F04ElementField.cc
index 096a1f5..bea18ae 100644
--- a/src/F04ElementField.cc
+++ b/src/F04ElementField.cc
@@ -158,7 +158,7 @@ G4VisAttributes* F04ElementField::getVisAttribute(G4String color)
         }
    }
 
-   if (!p) p = new G4VisAttributes(G4VisAttributes::Invisible);
+   if (!p) p = new G4VisAttributes(G4VisAttributes::GetInvisible());
    p->SetDaughtersInvisible(false);
 
    return p;
diff --git a/src/musrDetectorConstruction.cc b/src/musrDetectorConstruction.cc
index c00f70a..5e557bc 100644
--- a/src/musrDetectorConstruction.cc
+++ b/src/musrDetectorConstruction.cc
@@ -1977,7 +1977,7 @@ void musrDetectorConstruction::SetColourOfLogicalVolume(G4LogicalVolume* pLogVol
     else if (strcmp(colour,"gray"   )==0) {pLogVol->SetVisAttributes(G4Colour(0.5,0.5,0.5));}
     else if (strcmp(colour,"cyan"   )==0) {pLogVol->SetVisAttributes(G4Colour(0,1,1));}
     else if (strcmp(colour,"magenta")==0) {pLogVol->SetVisAttributes(G4Colour(1,0,1));}
-    else if (strcmp(colour,"invisible" )==0) {pLogVol->SetVisAttributes(G4VisAttributes::Invisible);}
+    else if (strcmp(colour,"invisible" )==0) {pLogVol->SetVisAttributes(G4VisAttributes::GetInvisible());}
 
     else if (strcmp(colour,"blue_style")==0) {pLogVol->SetVisAttributes(G4Colour(0.80,0.83,1));}
     //    else if (strcmp(colour,"lightblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.5,1));}
diff --git a/src/musrSteppingAction.cc b/src/musrSteppingAction.cc
index 0e4bacc..6f804ca 100644
--- a/src/musrSteppingAction.cc
+++ b/src/musrSteppingAction.cc
@@ -160,7 +160,7 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep)  {
     // There is an example how to delete the track in example/novice/N04.
     // It is done in a different way here, because the example/novice/N04 was not doing
     // exactly what I wanted.
-    if((actualVolume(0,8)=="log_kill")||(actualVolume(0,8)=="log_Kill")) { 
+    if((actualVolume.substr(0,8)=="log_kill")||(actualVolume.substr(0,8)=="log_Kill")) { 
       aTrack->SetTrackStatus(fStopAndKill);   // suspend the track
     }
     if ((p_name=="nu_mu")||(p_name=="anti_nu_mu")||(p_name=="nu_e")||(p_name=="anti_nu_e")) {
@@ -390,7 +390,7 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep)  {
       // There is an example how to delete the track in example/novice/N04.
       // It is done in a different way here, because the example/novice/N04 was not doing
       // exactly what I wanted.
-      if((actualVolume(0,10)=="log_shield")||(actualVolume(0,10)=="log_Shield")) { 
+      if((actualVolume.substr(0,10)=="log_shield")||(actualVolume.substr(0,10)=="log_Shield")) { 
 	aTrack->SetTrackStatus(fStopAndKill);   // suspend the track
       }
     }