diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c9d86e74..90d833fb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,11 +221,11 @@ check_compiler()
 
 if(DEFINED ENV{WERROR} AND "$ENV{WERROR}")
   message(STATUS "Will compile with -Werror. ")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat-security -Werror -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable -Wfatal-errors")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-non-virtual-dtor -Wno-long-long -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -Wno-variadic-macros -Wshadow -Wformat-security -Werror -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable -Wfatal-errors")
 else()
   if (NOT APPLE)
     message(STATUS "Set env WERROR to 1 to enable -Werror. If origin/dev compiles on your platform with that option, it is definitly a good idea to do that.")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat-security -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-non-virtual-dtor -Wno-long-long -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -Wno-variadic-macros -Wshadow -Wformat-security -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable")
   endif()
 endif()
 set(CMAKE_CXX_FLAGS "-D_GLIBCXX_ASSERTIONS ${CMAKE_CXX_FLAGS}" )
diff --git a/los/calib/R3BLosCal2Hit.h b/los/calib/R3BLosCal2Hit.h
index a86e8a8f6..0f15f4f19 100644
--- a/los/calib/R3BLosCal2Hit.h
+++ b/los/calib/R3BLosCal2Hit.h
@@ -244,7 +244,6 @@ class R3BLosCal2Hit : public FairTask
     TH2F* fhQ3_vs_Q7_corr;
     TH2F* fhQ4_vs_Q8;
     TH2F* fhQ4_vs_Q8_corr;
-    ;
     TH2F* fhTresX_M;
     TH2F* fhTresY_M;
     TH2F* fhTresX_T;