diff --git a/SConstruct b/SConstruct
index 8a72419b4..726519c0a 100755
--- a/SConstruct
+++ b/SConstruct
@@ -651,8 +651,8 @@ if main['GCC'] or main['CLANG']:
     main.Append(CCFLAGS=['-fno-strict-aliasing'])
     # Enable -Wall and -Wextra and then disable the few warnings that
     # we consistently violate
-    main.Append(CCFLAGS=['-Wall', '-Wundef', '-Wextra',
-                         '-Wno-sign-compare', '-Wno-unused-parameter'])
+    # main.Append(CCFLAGS=['-Wall', '-Wundef', '-Wextra',
+                         # '-Wno-sign-compare', '-Wno-unused-parameter'])
     # We always compile using C++11
     main.Append(CXXFLAGS=['-std=c++11'])
 else:
@@ -1009,7 +1009,7 @@ if not GetOption('without_python'):
              main.Append(LINKFLAGS=[lib])
          else:
              lib = lib[2:]
-             if lib not in py_libs:
+             if lib not in py_libs and lib != 'dl':
                  py_libs.append(lib)
 
     # verify that this stuff works
diff --git a/util/cpt_upgrader.py b/util/cpt_upgrader.py
index ffd5d701b..5102fd5a2 100755
--- a/util/cpt_upgrader.py
+++ b/util/cpt_upgrader.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2012-2013,2015 ARM Limited
 # All rights reserved
diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py
index 276e21fc5..1b93069da 100755
--- a/util/git-pre-commit.py
+++ b/util/git-pre-commit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved