diff --git a/odoo/service/server.py b/odoo/service/server.py
index 421de812ba5..94f551b025d 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -701,7 +701,7 @@ class PreforkServer(CommonServer):
 
     def long_polling_spawn(self):
         nargs = stripped_sys_argv()
-        cmd = [sys.executable, sys.argv[0], 'gevent'] + nargs[1:]
+        cmd = [sys.argv[0], 'gevent'] + nargs[1:]
         popen = subprocess.Popen(cmd)
         self.long_polling_pid = popen.pid
 
diff --git a/odoo/addons/base/models/ir_attachment.py b/odoo/addons/base/models/ir_attachment.py
index abbbe7826a3..7e31edf21d3 100644
--- a/odoo/addons/base/models/ir_attachment.py
+++ b/odoo/addons/base/models/ir_attachment.py
@@ -46,7 +46,7 @@ class IrAttachment(models.Model):
 
     @api.model
     def _storage(self):
-        return self.env['ir.config_parameter'].sudo().get_param('ir_attachment.location', 'file')
+        return self.env['ir.config_parameter'].sudo().get_param('ir_attachment.location', 'db')
 
     @api.model
     def _filestore(self):