diff --git a/Makefile.conf b/Makefile.conf
index 60768c1..2414865 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -26,7 +26,7 @@ TARGET=libpEpAdapter.a
 
 # Build config
 # Defaults
-DEBUG=1
+DEBUG?=debug
 PREFIX?=$(HOME)
 
 # Constants
@@ -44,10 +44,10 @@ else ifneq (,$(findstring clang,$(CXX)))
     CFLAGS+=-fcolor-diagnostics
 endif
 
-ifeq ($(DEBUG),1)
-    CXXFLAGS+=-g -O0
-    CFLAGS+=-g -O0
-else
+ifeq ($(DEBUG),release)
     CXXFLAGS+=-DNDEBUG=1 -O3
     CFLAGS+=-DNDEBUG=1 -O3
+else
+    CXXFLAGS+=-g -O0
+    CFLAGS+=-g -O0
 endif
diff --git a/build.conf.example b/build.conf.example
index 5c79d84..15e87ef 100644
--- a/build.conf.example
+++ b/build.conf.example
@@ -6,8 +6,8 @@
 ######### C++ Compiler #########
 # Should work with clang and g++
 # CXX=g++
-# DEBUG=1       # DEBUG Build (Default)
-# DEBUG=0       # RELEASE Build
+# DEBUG=debug         # DEBUG Build (Default)
+# DEBUG=release       # RELEASE Build
 
 ############# DIRS #############
 # PREFIX=$(HOME)/local
diff --git a/src/callback_dispatcher.hh b/src/callback_dispatcher.hh
index c13e4c0..115cbca 100644
--- a/src/callback_dispatcher.hh
+++ b/src/callback_dispatcher.hh
@@ -4,6 +4,7 @@
 #ifndef LIBPEPADAPTER_CALLBACK_DISPATCHER_HH
 #define LIBPEPADAPTER_CALLBACK_DISPATCHER_HH
 
+#include <stdexcept>
 #include <vector>
 #include <functional>
 #include <mutex>