diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 6060d97c182..c471c137f12 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -143,7 +143,7 @@ class account_entries_report(osv.osv):
                 l.amount_currency as amount_currency,
                 l.debit as debit,
                 l.credit as credit,
-                l.debit-l.credit as balance
+                coalesce(l.debit, 0.0) - coalesce(l.credit, 0.0) as balance
             from
                 account_move_line l
                 left join account_account a on (l.account_id = a.id)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a1618f2a189..249257f1092 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -574,7 +574,7 @@ def content_disposition(filename):
     if browser == 'msie' and version < 9:
         return "attachment; filename=%s" % escaped
     elif browser == 'safari':
-        return "attachment; filename=%s" % filename
+        return "attachment; filename=\"%s\"" % filename
     else:
         return "attachment; filename*=UTF-8''%s" % escaped