diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 6e0e4437487..2ce486fc1c8 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -3,18 +3,23 @@ odoo.define('website.ace', function (require) {
 
 var Widget = require('web.Widget');
 var website = require('website.website');
+var mixins = require('web.mixins');
 
 var ViewEditor = require('web_editor.ace');
 
 var hash = "#advanced-view-editor";
 
-var Ace = Widget.extend({
+var Ace = Widget.extend(mixins.ServiceProvider, {
     events: {
         "click a[data-action=ace]": function (e) {
             e.preventDefault();
             this.launchAce();
         },
     },
+    init: function () {
+        mixins.ServiceProvider.init.apply(this, arguments);
+        this._super.apply(this, arguments);
+    },
     start: function () {
         if (window.location.hash.substr(0, hash.length) === hash) {
             this.launchAce();
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 219728aa552..a05fc4a5883 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -6,6 +6,7 @@ var ajax = require('web.ajax');
 var Class = require('web.Class');
 var Dialog = require('web.Dialog');
 var mixins = require('web.mixins');
+var rpc = require("web.rpc");
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
@@ -490,22 +491,21 @@ var Configurator = Dialog.extend({
             def.resolve(null);
         } else {
             var fields = ['website_meta_title', 'website_meta_description', 'website_meta_keywords'];
-            this._rpc({
-                    model: obj.model,
-                    method: 'read',
-                    args: [[obj.id], fields, base.get_context()],
-                })
-                .then(function (data) {
-                    if (data.length) {
-                        var meta = data[0];
-                        meta.model = obj.model;
-                        def.resolve(meta);
-                    } else {
-                        def.resolve(null);
-                    }
-                }).fail(function () {
-                    def.reject();
-                });
+            rpc.query({
+                model: obj.model,
+                method: 'read',
+                args: [[obj.id], fields, base.get_context()],
+            }).then(function (data) {
+                if (data.length) {
+                    var meta = data[0];
+                    meta.model = obj.model;
+                    def.resolve(meta);
+                } else {
+                    def.resolve(null);
+                }
+            }).fail(function () {
+                def.reject();
+            });
         }
         return def;
     },
@@ -514,11 +514,11 @@ var Configurator = Dialog.extend({
         if (!obj) {
             return $.Deferred().reject();
         } else {
-            return this._rpc({
-                    model: obj.model,
-                    method: 'write',
-                    args: [[obj.id], data, base.get_context()],
-                });
+            return rpc.query({
+                model: obj.model,
+                method: 'write',
+                args: [[obj.id], data, base.get_context()],
+            });
         }
     },
     titleChanged: function () {