diff --git a/.travis.yml b/.travis.yml
index d6397e35d..f0816d2d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -222,7 +222,8 @@ script:
         python setup.py build;
         python setup.py bdist_wheel;
         python setup.py install;
-        cp -a dist deploy/;
+        mkdir -p deploy/dist;
+        cp -a dist deploy/dist;
         python -c 'import klayout.db as db; print(dir(db))';
         python -c 'import klayout.rdb as rdb; print(dir(rdb))';
         python -c 'import klayout.tl as tl; print(dir(tl))';
@@ -232,5 +233,4 @@ script:
     fi
 
 after_success:
-  - mkdir -p deploy
   - dropbox-deployment
diff --git a/setup.py b/setup.py
index f817cf5b0..bf862b4e1 100644
--- a/setup.py
+++ b/setup.py
@@ -148,8 +148,9 @@ class Config(object):
         elif platform.system() == "Darwin":
             return []
         else:
-            # Avoids many "type-punned pointer" warnings
-            return ["-Wno-strict-aliasing"]
+            return ["-Wno-strict-aliasing",  # Avoids many "type-punned pointer" warnings
+                    "-std=c++0x",  # because we use unordered_map/unordered_set
+                    ]
 
     def link_args(self, mod):
         """
@@ -173,7 +174,7 @@ class Config(object):
             # build path and the loader will fail.
             args = []
             args += ['-Wl,-soname,' + self.libname_of(mod)]
-            if not '_dbpi' in mod:
+            if '_dbpi' not in mod:
                 loader_path = '$ORIGIN'
             else:
                 loader_path = '$ORIGIN/..'