diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 56162cb2139..d9855034018 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -114,7 +114,7 @@ class sale_order(osv.Model):
             s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
             s -= set(l.product_id.id for l in order.order_line)
             product_ids = random.sample(s, min(len(s),3))
-            return self.pool['product.template'].browse(cr, uid, product_ids, context=context)
+            return self.pool['product.product'].browse(cr, uid, product_ids, context=context)
 
 class website(orm.Model):
     _inherit = 'website'
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index a173452c9ec..8cfb4e2cdad 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -32,7 +32,7 @@
             },
             {
                 title:     "finish",
-                waitFor:   'label:contains(32 Go) input',
+                waitFor:   'form[action="/shop/cart/update"] label:contains(32 Go) input',
             }
         ]
     });
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 8811f6c90f9..237f87d0886 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -727,14 +727,14 @@
               <tr t-foreach="suggested_products" t-as="product">
 
                   <td>
-                      <a t-attf-href="/shop/product/#{ slug(product) }">
+                      <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                           <span t-field="product.image_small"
                                 t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                       </a>
                   </td>
                   <td>
                       <div>
-                          <a t-attf-href="/shop/product/#{ slug(product) }">
+                          <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                               <strong t-field="product.name"/>
                           </a>
                       </div>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 5a1a93105b5..86e369f11e7 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -25,6 +25,7 @@
                     <field name="public_categ_ids" widget="many2many_tags"/>
                     <field name="website_published" class="pull-right" widget="website_button"/>
                     <field name="alternative_product_ids" widget="many2many_tags"/>
+                    <field name="accessory_product_ids" widget="many2many_tags"/>
                     <field name="website_style_ids" widget="many2many_tags"/>
                     <field name="website_sequence"/>
                 </group>