diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index b438c10e0..6b5622ff8 100644
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -1165,7 +1165,7 @@
     </route>
 
     <route id="export.customer.newsletter" path="/admin/export/customer/newsletter">
-        <default key="_controller">Thelia\Controller\Admin\CustomerExportController::NewsletterExportAction</default>
+        <default key="_controller">Thelia\Controller\Admin\CustomerExportController::newsletterExportAction</default>
     </route>
 
     <!-- The default route, to display a template -->
diff --git a/core/lib/Thelia/Controller/Admin/CustomerExportController.php b/core/lib/Thelia/Controller/Admin/CustomerExportController.php
index 5e9900dba..0036f2d53 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerExportController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerExportController.php
@@ -25,7 +25,7 @@ use Thelia\Model\NewsletterQuery;
 class CustomerExportController extends BaseAdminController
 {
 
-    public function NewsletterExportAction()
+    public function newsletterExportAction()
     {
         if (null !== $response = $this->checkAuth([AdminResources::EXPORT_CUSTOMER_NEWSLETTER], [], [AccessManager::VIEW])) {
             return $response;
diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index 90b54e3fd..9ecee9182 100644
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -190,9 +190,6 @@ class Category extends BaseI18nLoop implements PropelSearchLoopInterface, Search
             }
         }
 
-        /* @todo */
-        $notEmpty  = $this->getNot_empty();
-
         return $search;
 
     }
diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php
index c46739aa9..310a760e2 100644
--- a/core/lib/Thelia/Core/Template/Loop/Coupon.php
+++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php
@@ -152,9 +152,6 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface
         /** @var ConditionFactory $conditionFactory */
         $conditionFactory = $this->container->get('thelia.condition.factory');
 
-        /** @var Request $request */
-        $request = $this->container->get('request');
-
         /** @var MCoupon $coupon */
         foreach ($loopResult->getResultDataCollection() as $coupon) {
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index 618c411e3..ee4e0cbbe 100644
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -157,9 +157,6 @@ class Folder extends BaseI18nLoop implements PropelSearchLoopInterface, SearchLo
             }
         }
 
-        /* @todo */
-        $notEmpty  = $this->getNot_empty();
-
         return $search;
 
     }
diff --git a/core/lib/Thelia/Coupon/Type/FreeProduct.php b/core/lib/Thelia/Coupon/Type/FreeProduct.php
index 42a106f4e..3032813a8 100644
--- a/core/lib/Thelia/Coupon/Type/FreeProduct.php
+++ b/core/lib/Thelia/Coupon/Type/FreeProduct.php
@@ -234,9 +234,6 @@ class FreeProduct extends AbstractRemoveOnProducts
             }
 
             if ($freeProductCartItem instanceof CartItem) {
-
-                $taxCountry = $this->facade->getDeliveryCountry();
-
                 // The discount is the product price.
                 $discount = $freeProductCartItem->getPromo() ?
                     $freeProductCartItem->getPromoPrice() : $freeProductCartItem->getPrice();
diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php
index 351283d8c..caf8fe61f 100644
--- a/core/lib/Thelia/Tools/FileManager.php
+++ b/core/lib/Thelia/Tools/FileManager.php
@@ -95,10 +95,11 @@ class FileManager
             if (!$model->save()) {
                 throw new ImageException(
                     sprintf(
-                        '%s %s (%s) failed to be saved (image file)',
+                        '%s %s (%s) with id %d failed to be saved (image file)',
                         ucfirst($parentType),
                         $model->getFile(),
-                        $fileType
+                        $fileType,
+                        $parentId
                     )
                 );
             }