diff --git a/Makefile.conf b/Makefile.conf
index 6299729..c69f453 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -16,8 +16,9 @@ PREFIX?=$(HOME)
 -include $(HERE)local.conf
 
 # Constants
-CXXFLAGS+=-std=c++11 -fPIC -Wall -Wextra -pedantic
-CXXFLAGS+=-I$(PREFIX)/include
+CXXFLAGS+=-std=c++11 -fPIC
+CXXFLAGS+=-Wall -pedantic-errors -Wno-unused-parameter -Wno-reorder-ctor
+CXXFLAGS+=-isystem $(PREFIX)/include
 CFLAGS+=-fPIC -pthread -DSQLITE_THREADSAFE=1
 LDFLAGS+=-L$(PREFIX)/lib
 
@@ -25,7 +26,7 @@ ifneq (,$(findstring g++,$(CXX)))
     CXXFLAGS+=-fdiagnostics-color=always
     CFLAGS+=-fdiagnostics-color=always
 else ifneq (,$(findstring clang,$(CXX)))
-    CXXFLAGS+=-fcolor-diagnostics
+    CXXFLAGS+=-fcolor-diagnostics -fdiagnostics-show-template-tree
     CFLAGS+=-fcolor-diagnostics
 endif