diff --git a/Makefile b/Makefile
index 6f3d17d11..ae0bbf86a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ HOSTCC = gcc
 SFLAGS += -Ilib -I.
 
 # Flags - Building options
-SFLAGS += -Wall -Werror
+SFLAGS += -Wall
 
 # Flags - Optimizations
 ifeq ($(DEBUG),1)
diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp
index f3cfd5d4d..4d18a6f6d 100644
--- a/poincare/src/expression.cpp
+++ b/poincare/src/expression.cpp
@@ -38,7 +38,6 @@ Expression * Expression::simplify() {
       const Simplification * simplification = (simplifications + i); // Pointer arithmetics
       Expression * simplified = simplification->simplify(result);
       if (simplified != nullptr) {
-        std::cout << "simplification " << i << " returned a non null pointer" << std::endl;
         PRINT_AST(simplified);
         simplification_pass_was_useful = true;
         if (result != this) {
diff --git a/poincare/src/simplify/expression_selector.h b/poincare/src/simplify/expression_selector.h
index 15fbaf0fe..63bfaf38b 100644
--- a/poincare/src/simplify/expression_selector.h
+++ b/poincare/src/simplify/expression_selector.h
@@ -15,6 +15,7 @@ public:
     Any,
     Type,
     Wildcard,
+    TypeAndValue,
   };
   ExpressionSelector * child(int i);
   /* The match function is interesting