diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 617728ab205..bec4a35637a 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -1,4 +1,17 @@
 openerp.website = function(instance) {
+
+instance.web.ActionManager.include({
+    // Temporary fix until un-webclientization of the editorbar
+    ir_actions_client: function (action) {
+        if (instance.web.client_actions.get_object(action.tag)) {
+            return this._super.apply(this, arguments);
+        } else {
+            console.warn("Action '%s' not found in registry", action.tag);
+            return $.when();
+        }
+    }
+});
+
 var _lt = instance.web._lt;
 var QWeb = instance.web.qweb;
 instance.website.EditorBar = instance.web.Widget.extend({
diff --git a/addons/website/website.py b/addons/website/website.py
index b4f2da2ea80..ef2464983ab 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -20,8 +20,9 @@ http.auth_methods['public'] = auth_method_public
 
 class website(object):
     def render(self, template, add_values={}):
-        script = "\n".join(['<script type="text/javascript" src="%s"></script>' % i for i in main.manifest_list('js', db=request.db)])
-        css = "\n".join('<link rel="stylesheet" href="%s">' % i for i in main.manifest_list('css', db=request.db))
+        debug = 'debug' in request.params
+        script = "\n".join(['<script type="text/javascript" src="%s"></script>' % i for i in main.manifest_list('js', db=request.db, debug=debug)])
+        css = "\n".join('<link rel="stylesheet" href="%s">' % i for i in main.manifest_list('css', db=request.db, debug=debug))
         _values = {
             'editable': request.uid != request.public_uid,
             'request': request,
@@ -35,4 +36,4 @@ class website(object):
         }
         _values.update(add_values)
         return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, _values)
-website = website()
\ No newline at end of file
+website = website()