diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py
--- a/ennstatus/api/views.py
+++ b/ennstatus/api/views.py
@@ -97,7 +97,7 @@ def export(export_format, server_type):
             servers = list(all_servers_by_type(server_type.capitalize()))
 
         if export_format == 'json':
-            response = {'enn-network': servers}
+            response = {'enn_network': servers}
             current_app.logger.info('Returning as json!')
             return jsonify(response)
         else:
diff --git a/ennstatus/donate/functions.py b/ennstatus/donate/functions.py
--- a/ennstatus/donate/functions.py
+++ b/ennstatus/donate/functions.py
@@ -8,7 +8,7 @@ def load_csv(date):
     filename = '.'.join([date, 'csv'])
     path = os.path.join('donations', filename)
 
-    with open(path, newline='') as csvfile:
+    with open(path) as csvfile:
         csvreader = csv.reader(csvfile, delimiter=',')
 
         for row in csvreader:
diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py
--- a/ennstatus/donate/views.py
+++ b/ennstatus/donate/views.py
@@ -69,7 +69,7 @@ def received():
                 csv_file = load_csv(date)
             else:
                 current_app.logger.warn('Date %s not found' % date)
-                return ('Date %s not found!', 500,
+                return ('Date %s not found!' % date, 500,
                         {'Content-Type': 'text/plain'})
         else:
             current_app.logger.info('Showing last date %s' % choices[-1])
diff --git a/ennstatus/templates/api/extract/xml/network.xml b/ennstatus/templates/api/extract/xml/network.xml
--- a/ennstatus/templates/api/extract/xml/network.xml
+++ b/ennstatus/templates/api/extract/xml/network.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<enn-network>
+<enn_network>
   {% for server in servers %}
     {%- include "api/extract/xml/server.xml" %}
   {% endfor %}
-</enn-network>
+</enn_network>
diff --git a/ennstatus/templates/donate/macros.html b/ennstatus/templates/donate/macros.html
--- a/ennstatus/templates/donate/macros.html
+++ b/ennstatus/templates/donate/macros.html
@@ -24,9 +24,9 @@
       {% for row in csv_file %}
         <tr>
           <td>{{ loop.index }}</td>
-          <td>{{ row[0] }}</td>
-          <td>{{ row[1] }}</td>
-          <td>{{ colorize_numbers(row[2]) }}</td>
+          <td>{{ row[0].decode('utf-8') }}</td>
+          <td>{{ row[1].decode('utf-8') }}</td>
+          <td>{{ colorize_numbers(row[2].decode('utf-8')) }}</td>
         </tr>
       {% endfor %}
     </tbody>