diff --git a/Makefile b/Makefile
index f660192..f0a4986 100644
--- a/Makefile
+++ b/Makefile
@@ -36,4 +36,4 @@ DBDS += turboPmac/src/turboPmac.dbd
 DBDS += src/beamShift.dbd
 
 USR_CFLAGS += -Wall -Wextra -Wunused-result -Werror # -Wpedantic // Does not work because EPICS macros trigger warnings
-USR_CXXFLAGS += -Wall -Wextra -Wunused-result
+USR_CXXFLAGS += -Wall -Wextra -Wunused-result -Werror
diff --git a/turboPmac b/turboPmac
index 9d61852..62ccf04 160000
--- a/turboPmac
+++ b/turboPmac
@@ -1 +1 @@
-Subproject commit 9d618527139516b036775c6daba0c84a985704ed
+Subproject commit 62ccf046fda111d62723615913d73f5bc3dd5810