diff --git a/Makefile b/Makefile
index a55c41842..7aa5ede3f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ include ion/Makefile
 include kandinsky/Makefile
 include poincare/Makefile
 include python/Makefile
-include escher/Makefile
+#include escher/Makefile
 # Executable Makefiles
-include apps/Makefile
+#include apps/Makefile
 include build/struct_layout/Makefile
 include quiz/Makefile # Quiz needs to be included at the end
 
diff --git a/poincare/Makefile b/poincare/Makefile
index c19891377..cc3b0f416 100644
--- a/poincare/Makefile
+++ b/poincare/Makefile
@@ -5,10 +5,13 @@ SFLAGS += -Ipoincare/include
 objs += $(addprefix poincare/src/,\
   tree_node.o\
   tree_pool.o\
-  tree_reference.o\
+  tree_by_reference.o\
+  tree_by_value.o\
+  undefined.o\
+  infinity.o\
 )
 
-objs += $(addprefix poincare/src/,\
+objsExpected += $(addprefix poincare/src/,\
   binomial_coefficient_layout_node.o\
   bracket_layout_node.o\
   bracket_pair_layout_node.o\
@@ -36,7 +39,7 @@ objs += $(addprefix poincare/src/,\
   vertical_offset_layout_node.o\
 )
 
-objs += $(addprefix poincare/src/,\
+objsExpected += $(addprefix poincare/src/,\
   absolute_value.o\
   addition.o\
   approximation_helper.o\
diff --git a/poincare/include/poincare.h b/poincare/include/poincare.h
index 07e817861..28867d640 100644
--- a/poincare/include/poincare.h
+++ b/poincare/include/poincare.h
@@ -3,10 +3,10 @@
 
 #define MATRICES_ARE_DEFINED 1
 
+#if 0
 #include <poincare/absolute_value.h>
 #include <poincare/absolute_value_layout_node.h>
 #include <poincare/addition.h>
-#include <poincare/approximation.h>
 #include <poincare/allocation_failed_layout_node.h>
 #include <poincare/arc_cosine.h>
 #include <poincare/arc_sine.h>
@@ -37,6 +37,7 @@
 #include <poincare/expression_array.h>
 #include <poincare/factor.h>
 #include <poincare/factorial.h>
+#include <poincare/float.h>
 #include <poincare/floor.h>
 #include <poincare/floor_layout_node.h>
 #include <poincare/frac_part.h>
@@ -102,5 +103,9 @@
 #include <poincare/undefined.h>
 #include <poincare/variable_context.h>
 #include <poincare/vertical_offset_layout_node.h>
+#else
+
+#include <poincare/print_float.h>
 
 #endif
+#endif
diff --git a/poincare/include/poincare/allocation_failure_expression_node.h b/poincare/include/poincare/allocation_failure_expression_node.h
index d56b2a867..fde58a3a0 100644
--- a/poincare/include/poincare/allocation_failure_expression_node.h
+++ b/poincare/include/poincare/allocation_failure_expression_node.h
@@ -25,7 +25,7 @@ public:
   LayoutRef createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override { return AllocationFailedLayoutRef(); }
 
   // TreeNode
-  size_t size() const override { return sizeof(AllocationFailureExpressionNode); }
+  size_t size() const override { return sizeof(AllocationFailureExpressionNode<T>); }
 #if TREE_LOG
   const char * description() const override { return "AllocationFailureExpression";  }
 #endif
diff --git a/poincare/include/poincare/ghost_node.h b/poincare/include/poincare/ghost_node.h
index bd737cc80..bcf15fc17 100644
--- a/poincare/include/poincare/ghost_node.h
+++ b/poincare/include/poincare/ghost_node.h
@@ -18,7 +18,7 @@ public:
   // Ghost
   bool isGhost() const override { return true; }
   // Allocation Failure
-  static TreeNode * FailedAllocationStaticNode();
+  static GhostNode * FailedAllocationStaticNode();
   TreeNode * failedAllocationStaticNode() override { return FailedAllocationStaticNode(); }
 };
 
diff --git a/poincare/src/ghost_node.cpp b/poincare/src/ghost_node.cpp
index d47d90978..df3523d84 100644
--- a/poincare/src/ghost_node.cpp
+++ b/poincare/src/ghost_node.cpp
@@ -2,7 +2,7 @@
 
 namespace Poincare {
 
-TreeNode * GhostNode::FailedAllocationStaticNode() {
+GhostNode * GhostNode::FailedAllocationStaticNode() {
   static AllocationFailedGhostNode FailureNode;
   TreePool::sharedPool()->registerStaticNodeIfRequired(&FailureNode);
   return &FailureNode;