diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index a13d4c3b256f4..a7fc18cbeff3b 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute\Frontend;
 
-class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
+class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\DefaultFrontend
 {
     /**
      * Store manager
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index db299487d17d8..84be9271980b4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -110,7 +110,7 @@ switch ($type = $block->getType()) {
 
     case 'crosssell':
         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
-        if ($exist = $block->getItemCount()) {
+        if ($exist = count($block->getItems())) {
             $type = 'crosssell';
             $class = $type;