diff --git a/init_env b/init_env
index e1d388e63f745330e117d9071c28f60462fd0e62..5e59e95c28f09e564a33f3512b5d052c138560f3 100644
--- a/init_env
+++ b/init_env
@@ -55,6 +55,6 @@ else
 	echo "Please, source this configuration from a terminal running BASH."
 fi
 
-exit $RET
+return $RET
 
 # vim :set tabstop=4 shiftwidth=4 textwidth=80 expandtab
diff --git a/tools/bisector/bisector/bisector.py b/tools/bisector/bisector/bisector.py
index cab7dae29083874801904bdb0cade98b4519ae14..392e11ac55cfb5b4f6f04dd56d25a3f41f46a87c 100755
--- a/tools/bisector/bisector/bisector.py
+++ b/tools/bisector/bisector/bisector.py
@@ -1276,7 +1276,9 @@ class StepBase(StepABC):
 
         # Merge the dictionaries, env takes precedence
         user_env = env
-        env = copy.copy(os.environ)
+        # A deepcopy is required, otherwise we modify our own environment as
+        # well
+        env = copy.deepcopy(os.environ)
         env.update(user_env)
 
         for j in range(1, self.trials + 1):
@@ -1783,7 +1785,7 @@ class ExekallLISATestStep(ShellStep):
     def __init__(self,
             compress_artifact = Default,
             upload_artifact = Default,
-            **kwargs,
+            **kwargs
         ):
         super().__init__(**kwargs)
 
@@ -2299,7 +2301,7 @@ class LISATestStep(ShellStep):
     def __init__(self,
             compress_results = Default,
             upload_results = Default,
-            **kwargs,
+            **kwargs
         ):
         super().__init__(**kwargs)
         self.upload_results = upload_results