diff --git a/quality_control_team_oca/__manifest__.py b/quality_control_team_oca/__manifest__.py
index 79f5d536f..2b51095b3 100644
--- a/quality_control_team_oca/__manifest__.py
+++ b/quality_control_team_oca/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Quality Control Team OCA",
     "summary": "Adds quality control teams to handle different quality "
     "control workflows",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Quality Control",
     "website": "https://github.com/OCA/manufacture",
     "author": "Eficent, Odoo Community Association (OCA)",
diff --git a/quality_control_team_oca/data/quality_control_team_data.xml b/quality_control_team_oca/data/quality_control_team_data.xml
index 66da23edf..dd50705a6 100644
--- a/quality_control_team_oca/data/quality_control_team_data.xml
+++ b/quality_control_team_oca/data/quality_control_team_data.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-<odoo>
-
-    <data noupdate="0">
-        <record model="qc.team" id="qc_team_main">
-            <field name="name">Main QC Team</field>
-            <field name="member_ids" eval="[(4, ref('base.user_admin'))]" />
-        </record>
-    </data>
-
+<odoo noupdate="0">
+    <record model="qc.team" id="qc_team_main">
+        <field name="name">Main QC Team</field>
+        <field name="member_ids" eval="[(4, ref('base.user_admin'))]" />
+    </record>
 </odoo>
diff --git a/quality_control_team_oca/models/qc_team.py b/quality_control_team_oca/models/qc_team.py
index dfd39888c..326e2b97e 100644
--- a/quality_control_team_oca/models/qc_team.py
+++ b/quality_control_team_oca/models/qc_team.py
@@ -49,7 +49,7 @@ class QualityControlTeam(models.Model):
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
-        default=lambda self: self.env["res.company"]._company_default_get("qc.team"),
+        default=lambda self: self.env.company,
     )
     user_id = fields.Many2one(comodel_name="res.users", string="Team Leader")
     member_ids = fields.One2many(
diff --git a/quality_control_team_oca/views/qc_team_view.xml b/quality_control_team_oca/views/qc_team_view.xml
index eccbc1498..c92c6fd1b 100644
--- a/quality_control_team_oca/views/qc_team_view.xml
+++ b/quality_control_team_oca/views/qc_team_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
+    <!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
     <record id="qc_team_view_form" model="ir.ui.view">
@@ -78,14 +78,21 @@
                                                     >
                                                         <strong
                                                             class="o_kanban_record_title"
-                                                        ><field name="name" /></strong>
+                                                        >
+                                                            <field name="name" />
+                                                        </strong>
                                                     </div>
                                                     <a
                                                         t-if="! read_only_mode"
                                                         type="delete"
                                                         class="text-danger"
                                                     >
-                                                        <i class="fa fa-times" />
+                                                        <i
+                                                            class="fa fa-times"
+                                                            aria-label="Unlink"
+                                                            role="img"
+                                                            title="Unlink"
+                                                        />
                                                     </a>
                                                 </div>
                                             </div>
@@ -125,7 +132,7 @@
         <field name="model">qc.team</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
-            <tree string="Quality Control Team">
+            <tree>
                 <field name="name" />
                 <field name="active" invisible="1" />
                 <field name="user_id" />
@@ -140,7 +147,8 @@
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 Click here to define a new quality control team.
-            </p><p>
+            </p>
+            <p>
                 Use quality control team to organize your different
                 departments into separate teams. Each team will work in
                 its own list of processes, stages...