diff --git a/storage_s3/indico_storage_s3/plugin.py b/storage_s3/indico_storage_s3/plugin.py
index 61ebfd4..77d7c36 100644
--- a/storage_s3/indico_storage_s3/plugin.py
+++ b/storage_s3/indico_storage_s3/plugin.py
@@ -104,7 +104,7 @@ class S3Storage(Storage):
 
     @contextmanager
     def get_local_path(self, file_id):
-        with NamedTemporaryFile(suffix='indico.tmp', dir=config.TEMP_DIR) as tmpfile:
+        with NamedTemporaryFile(suffix='indico.s3', dir=config.TEMP_DIR) as tmpfile:
             self._copy_file(self.open(file_id), tmpfile)
             tmpfile.flush()
             yield tmpfile.name
@@ -135,7 +135,7 @@ class S3Storage(Storage):
 
     def send_file(self, file_id, content_type, filename, inline=True):
         try:
-            content_disp = ('inline' if inline else 'attachment')
+            content_disp = 'inline' if inline else 'attachment'
             h = Headers()
             h.add('Content-Disposition', content_disp, filename=filename)
             url = self.client.generate_presigned_url('get_object',
diff --git a/storage_s3/indico_storage_s3/test.py b/storage_s3/indico_storage_s3/test.py
index 85176e5..e8dc122 100644
--- a/storage_s3/indico_storage_s3/test.py
+++ b/storage_s3/indico_storage_s3/test.py
@@ -46,8 +46,7 @@ def mock_bucket_created(self, name):
     pass
 
 
-class MockConfig:
-
+class MockConfig(object):
     def __init__(self):
         self.STORAGE_BACKENDS = {'s3': None}