diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff95ca200..e13e80920 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,7 +322,7 @@ 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"
+        "${CMAKE_CXX_FLAGS} -Wall -Wno-non-virtual-dtor -Wwrite-strings -Wpointer-arith -Wshadow -Wformat-security -Werror -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable -Wfatal-errors"
     )
 else()
     if(NOT APPLE)
@@ -331,7 +331,7 @@ else()
                 "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"
+            "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-ignored-qualifiers -Wfatal-errors -Wno-vla -Wwrite-strings -Woverloaded-virtual -Wshadow -Wformat-security -Wno-sign-compare -Wno-reorder"
         )
     endif()
 endif()
diff --git a/los/calib/R3BLosCal2Hit.h b/los/calib/R3BLosCal2Hit.h
index 229817e89..09187b083 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;