diff --git a/.ci_support/run_docker_linux.sh b/.ci_support/run_docker_linux.sh
index d92949b..e1e4cc7 100755
--- a/.ci_support/run_docker_linux.sh
+++ b/.ci_support/run_docker_linux.sh
@@ -6,8 +6,8 @@ cd /tmp
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX=~/.local \
       -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-      -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -D_GLIBCXX_ASSERTIONS" \
-      -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter" \
+      -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Wshadow -Werror -D_GLIBCXX_ASSERTIONS" \
+      -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter -Wno-shadow" \
       -DSPHINX_FLAGS="-W -T -j4" \
       /io
 make install
diff --git a/lib/src/otrobopt/InverseFORM.hxx b/lib/src/otrobopt/InverseFORM.hxx
index 16a6b20..714facc 100755
--- a/lib/src/otrobopt/InverseFORM.hxx
+++ b/lib/src/otrobopt/InverseFORM.hxx
@@ -38,7 +38,7 @@ class OTROBOPT_API InverseFORM
   : public OT::PersistentObject
 {
 
-  CLASSNAME;
+  CLASSNAME
 public:
 
   /** Default constructor */
diff --git a/lib/src/otrobopt/InverseFORMResult.hxx b/lib/src/otrobopt/InverseFORMResult.hxx
index 364c186..3f13a26 100755
--- a/lib/src/otrobopt/InverseFORMResult.hxx
+++ b/lib/src/otrobopt/InverseFORMResult.hxx
@@ -33,7 +33,7 @@ namespace OTROBOPT {
 class OTROBOPT_API InverseFORMResult:
   public OT::FORMResult
 {
-  CLASSNAME;
+  CLASSNAME
 public:
 
   /** Standard constructor */
diff --git a/lib/src/otrobopt/SubsetInverseSamplingResult.hxx b/lib/src/otrobopt/SubsetInverseSamplingResult.hxx
index c54de7c..5c0f1d7 100644
--- a/lib/src/otrobopt/SubsetInverseSamplingResult.hxx
+++ b/lib/src/otrobopt/SubsetInverseSamplingResult.hxx
@@ -30,7 +30,7 @@ namespace OTROBOPT
 class OTROBOPT_API SubsetInverseSamplingResult
 : public OT::ProbabilitySimulationResult
 {
-  CLASSNAME;
+  CLASSNAME
 public:
   
   /** Constructor with parameters */