diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11baaa2989bcffa3eb836c3ac8549a0f3d56d143..1f947620653f3b8056b8645d272616a40d962148 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 job-flake8-2:
   image: gitlab-registry.mpcdf.mpg.de/mpcdf/osc-plugins/python2:flake8
   script:
-    - flake8 --filename=*.py --count --ignore=E501 .
+    - flake8 --filename=*.py --count --ignore=E501,W503 .
 
 job-flake8-3:
   image: gitlab-registry.mpcdf.mpg.de/mpcdf/osc-plugins/python3:flake8
   script:
-    - flake8 --filename=*.py --count --ignore=E501 .
+    - flake8 --filename=*.py --count --ignore=E501,W503 .
diff --git a/mpcdf_enable_repositories.py b/mpcdf_enable_repositories.py
index a1aa7d5ebfd4269f43260ab4c1c098474e46f315..0008d138eb0f891a7a3bfa8a263c090f015c70ba 100644
--- a/mpcdf_enable_repositories.py
+++ b/mpcdf_enable_repositories.py
@@ -80,8 +80,8 @@ def do_mpcdf_enable_repositories(self, subcmd, opts, *args):
                 print("Removing attribute", attribute_name, "from package")
                 mpcdf_common.remove_attribute(api_url, project, package, attribute_name)
 
-        set_or_remove(opts.mpi_modules,      "MPCDF:mpi_modules")
-        set_or_remove(opts.cuda_modules,     "MPCDF:cuda_modules")
+        set_or_remove(opts.mpi_modules, "MPCDF:mpi_modules")
+        set_or_remove(opts.cuda_modules, "MPCDF:cuda_modules")
         set_or_remove(opts.compiler_modules, "MPCDF:compiler_modules")
 
     if opts.recreate or opts.set or opts.disable:
diff --git a/mpcdf_info.py b/mpcdf_info.py
index 498e58a07873c350126c267e77ca68c7da489a73..28385c259eeebf2c946e78d39797030f5c90ed50 100644
--- a/mpcdf_info.py
+++ b/mpcdf_info.py
@@ -74,9 +74,9 @@ def do_mpcdf_info(self, subcmd, opts, *args):
             return ""
 
         print(" " + pkg_name_fmt.format(package), "--set=" + (",".join(enabled_repos)),
-              subset("--compiler-modules", "MPCDF:compiler_modules") +
-              subset("--mpi-modules", "MPCDF:mpi_modules") +
-              subset("--cuda-modules", "MPCDF:cuda_modules"))
+              subset("--compiler-modules", "MPCDF:compiler_modules")
+              + subset("--mpi-modules", "MPCDF:mpi_modules")
+              + subset("--cuda-modules", "MPCDF:cuda_modules"))
     print()
 
     if unmanaged:
diff --git a/mpcdf_push.py b/mpcdf_push.py
index c292b92725c4eee5ab28b45739185af25a053ba3..c79dd82593d753194fc5d61c256238b765277217 100644
--- a/mpcdf_push.py
+++ b/mpcdf_push.py
@@ -39,6 +39,8 @@ def do_mpcdf_push(self, subcmd, opts, *args):
 
     ${cmd_option_list}
     """
+    import sys
+
     if len(args) < 1:
         raise osc.oscerr.WrongArgs("Not enough arguments")
     elif len(args) == 1: