diff --git a/es-core/src/components/BadgesComponent.cpp b/es-core/src/components/BadgesComponent.cpp
index 8adff44a1..e2fd9bfe4 100644
--- a/es-core/src/components/BadgesComponent.cpp
+++ b/es-core/src/components/BadgesComponent.cpp
@@ -51,8 +51,7 @@ BadgesComponent::BadgesComponent(Window *window)
 }
 
 BadgesComponent::~BadgesComponent() {
-    mBadgeIcons.clear();
-    mImageComponents.clear();
+    mChildren.clear();
 }
 
 
diff --git a/es-core/src/components/FlexboxComponent.cpp b/es-core/src/components/FlexboxComponent.cpp
index b29159188..6665b2883 100644
--- a/es-core/src/components/FlexboxComponent.cpp
+++ b/es-core/src/components/FlexboxComponent.cpp
@@ -121,12 +121,12 @@ void FlexboxComponent::computeLayout()
         float y = anchorY - anchorOriginY * size.y;
 
         // Apply item margin.
-        if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
+        /*if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
             (mDirection == "column" && i >= (int) mItemsPerLine))
             x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
         if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
             (mDirection == "row" && i >= (int) mItemsPerLine))
-            y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f);
+            y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f);*/
 
         // Apply alignment
         if (mAlign == ITEM_ALIGN_END) {