diff --git a/liba/include/stddef.h b/liba/include/stddef.h
index 1cc1637b5..170ece5b8 100644
--- a/liba/include/stddef.h
+++ b/liba/include/stddef.h
@@ -2,6 +2,6 @@
 #define LIBA_STDDEF_H
 
 #define NULL 0
-typedef int size_t;
+typedef __SIZE_TYPE__ size_t;
 
 #endif
diff --git a/poincare/src/commutative_operation.cpp b/poincare/src/commutative_operation.cpp
index adab9ec08..ff99d4d88 100644
--- a/poincare/src/commutative_operation.cpp
+++ b/poincare/src/commutative_operation.cpp
@@ -46,7 +46,7 @@ Expression * CommutativeOperation::clone() const {
 
 float CommutativeOperation::approximate(Context& context) const {
   float result = m_operands[0]->approximate(context);
-  for (size_t i=1; i<m_numberOfOperands; i++) {
+  for (int i=1; i<m_numberOfOperands; i++) {
     float next = m_operands[i]->approximate(context);
     result = this->operateApproximatevelyOn(result, next);
   }