diff --git a/src/module-elasticsuite-core/Search/Adapter/ElasticSuite/Response/DocumentFactory.php b/src/module-elasticsuite-core/Search/Adapter/ElasticSuite/Response/DocumentFactory.php
index cde008ad2..2c1105ac9 100644
--- a/src/module-elasticsuite-core/Search/Adapter/ElasticSuite/Response/DocumentFactory.php
+++ b/src/module-elasticsuite-core/Search/Adapter/ElasticSuite/Response/DocumentFactory.php
@@ -15,7 +15,7 @@
 namespace Smile\ElasticSuiteCore\Search\Adapter\ElasticSuite\Response;
 
 use Magento\Framework\Search\EntityMetadata;
-use Magento\Framework\Api\Search\Document;
+use Smile\ElasticSuiteCore\Search\Adapter\ElasticSuite\Response\Document;
 use Magento\Framework\ObjectManagerInterface;
 
 /**
diff --git a/src/module-elasticsuite-core/etc/di.xml b/src/module-elasticsuite-core/etc/di.xml
index e82a4bd3d..7046a5e7c 100644
--- a/src/module-elasticsuite-core/etc/di.xml
+++ b/src/module-elasticsuite-core/etc/di.xml
@@ -64,9 +64,6 @@
         </arguments>
     </type>
 
-    <preference for="Smile\ElasticSuiteCore\Api\Search\SpellcheckerInterface"
-                type="Smile\ElasticSuiteCore\Search\Adapter\ElasticSuite\Spellchecker" />
-
     <virtualType name="Magento\Framework\Search\EsHitMetadata" type="Magento\Framework\Search\EntityMetadata">
         <arguments>
             <argument name="entityId" xsi:type="string">_id</argument>
diff --git a/src/module-elasticsuite-tracker/Block/Config.php b/src/module-elasticsuite-tracker/Block/Config.php
index 3cf909795..1c2e61993 100644
--- a/src/module-elasticsuite-tracker/Block/Config.php
+++ b/src/module-elasticsuite-tracker/Block/Config.php
@@ -46,11 +46,10 @@ class Config extends \Magento\Framework\View\Element\Template
     /**
      * PHP Constructor
      *
-     * @param \Magento\Framework\View\Element\Template\Context   $context       App context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig   The Magento configuration
-     * @param \Magento\Framework\Json\Helper\Data                $jsonHelper    The Magento's JSON Helper
-     * @param \Smile\ElasticSuiteTracker\Helper\Data             $trackerHelper The Smile Tracker helper
-     * @param array                                              $data          additional datas
+     * @param \Magento\Framework\View\Element\Template\Context $context       App context
+     * @param \Magento\Framework\Json\Helper\Data              $jsonHelper    The Magento's JSON Helper
+     * @param \Smile\ElasticSuiteTracker\Helper\Data           $trackerHelper The Smile Tracker helper
+     * @param array                                            $data          additional datas
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,