diff --git a/document_page_approval/__manifest__.py b/document_page_approval/__manifest__.py
index 57dce431..3a785743 100644
--- a/document_page_approval/__manifest__.py
+++ b/document_page_approval/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Document Page Approval",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "author": "Savoir-faire Linux, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/knowledge",
     "license": "AGPL-3",
diff --git a/document_page_approval/data/email_template.xml b/document_page_approval/data/email_template.xml
index deb0ea5a..510e557e 100644
--- a/document_page_approval/data/email_template.xml
+++ b/document_page_approval/data/email_template.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!-- If user wants to make upgrade-proof customizations to email templates, he should edit ir.model.data and check noupdate himself -->
     <record id="email_template_new_draft_need_approval" model="mail.template">
diff --git a/document_page_approval/security/document_page_security.xml b/document_page_approval/security/document_page_security.xml
index f0c34538..b8b9fb2b 100644
--- a/document_page_approval/security/document_page_security.xml
+++ b/document_page_approval/security/document_page_security.xml
@@ -2,7 +2,7 @@
 <odoo>
     <record id="group_document_approver_user" model="res.groups">
         <field name="name">Approver</field>
-        <field name="category_id" ref="knowledge.module_category_knowledge" />
+        <field name="category_id" ref="document_knowledge.module_category_knowledge" />
         <field
             name="implied_ids"
             eval="[(4, ref('document_page.group_document_editor'))]"
@@ -14,7 +14,10 @@
     <record model="ir.rule" id="rule_change_request_global">
         <field name="name">Change Request Global</field>
         <field name="model_id" ref="model_document_page_history" />
-        <field name="groups" eval="[(6, 0, [ref('knowledge.group_document_user')])]" />
+        <field
+            name="groups"
+            eval="[(6, 0, [ref('document_knowledge.group_document_user')])]"
+        />
         <field
             name="domain_force"
         >['|',('state','=','approved'),('create_uid','=',user.id)]</field>
diff --git a/document_page_approval/tests/test_document_page_approval.py b/document_page_approval/tests/test_document_page_approval.py
index 6d0971c3..ac0f3c62 100644
--- a/document_page_approval/tests/test_document_page_approval.py
+++ b/document_page_approval/tests/test_document_page_approval.py
@@ -46,7 +46,7 @@ class TestDocumentPageApproval(common.TransactionCase):
         self.assertEqual(chreq.state, "to approve")
 
         # Needed to compute calculated fields
-        page.refresh()
+        page.invalidate_model()
         self.assertNotEqual(chreq.content, page.content)
 
         # who_am_i
@@ -61,7 +61,7 @@ class TestDocumentPageApproval(common.TransactionCase):
         # new changes should create change requests
         page.write({"content": "New content"})
         # Needed to compute calculated fields
-        page.refresh()
+        page.invalidate_model()
         self.assertNotEqual(page.content, "New content")
         chreq = self.history_obj.search(
             [("page_id", "=", page.id), ("state", "!=", "approved")]
diff --git a/document_page_approval/views/document_page_approval.xml b/document_page_approval/views/document_page_approval.xml
index f67d97a9..5445e490 100644
--- a/document_page_approval/views/document_page_approval.xml
+++ b/document_page_approval/views/document_page_approval.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!-- History Form View -->
     <record id="wiki_history_form_inherit" model="ir.ui.view">
@@ -112,16 +112,20 @@
         <field name="name">document.page.history.form</field>
         <field name="model">document.page.history</field>
         <field name="inherit_id" ref="wiki_history_form_inherit" />
-        <field
-            name="groups_id"
-            eval="[(6, 0, [ref('document_page.group_document_manager')])]"
-        />
         <field name="arch" type="xml">
             <!-- Readonly fields -->
-            <field name="name" position="attributes">
+            <field
+                name="name"
+                position="attributes"
+                groups="document_page.group_document_manager"
+            >
                 <attribute name="attrs">{'readonly': False}</attribute>
             </field>
-            <field name="summary" position="attributes">
+            <field
+                name="summary"
+                position="attributes"
+                groups="document_page.group_document_manager"
+            >
                 <attribute name="attrs">{'readonly': False}</attribute>
             </field>
         </field>
diff --git a/setup/document_page_approval/odoo/addons/document_page_approval b/setup/document_page_approval/odoo/addons/document_page_approval
new file mode 120000
index 00000000..1ddb53f1
--- /dev/null
+++ b/setup/document_page_approval/odoo/addons/document_page_approval
@@ -0,0 +1 @@
+../../../../document_page_approval
\ No newline at end of file
diff --git a/setup/document_page_approval/setup.py b/setup/document_page_approval/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/document_page_approval/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)