diff --git a/admin-tools/check-versions.sh b/admin-tools/check-versions.sh
index 19b6793db..11797ebcb 100755
--- a/admin-tools/check-versions.sh
+++ b/admin-tools/check-versions.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 function finish {
-  cd $owd
+  cd $mathics_core_owd
 }
 
 # FIXME put some of the below in a common routine
-owd=$(pwd)
+mathics_core_owd=$(pwd)
 trap finish EXIT
 
 cd $(dirname ${BASH_SOURCE[0]})
@@ -24,3 +24,4 @@ for version in $PYVERSIONS; do
     fi
     echo === $version ===
 done
+finish
diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh
index d2f045dd0..4cac84139 100755
--- a/admin-tools/make-dist.sh
+++ b/admin-tools/make-dist.sh
@@ -3,11 +3,11 @@ PACKAGE=mathics3
 
 # FIXME put some of the below in a common routine
 function finish {
-  cd $owd
+  cd $mathics_core_owd
 }
 
 cd $(dirname ${BASH_SOURCE[0]})
-owd=$(pwd)
+mathics_core_owd=$(pwd)
 trap finish EXIT
 
 if ! source ./pyenv-versions ; then
@@ -31,3 +31,4 @@ for pyversion in $PYVERSIONS; do
 done
 
 python ./setup.py sdist
+finish
diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions
index c18408d7b..8849e64b9 100644
--- a/admin-tools/pyenv-versions
+++ b/admin-tools/pyenv-versions
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.6.15 3.7.16 pyston-2.3.5 pypy3.9-7.3.11 3.8.17 3.9.18 3.10.13 3.11.7'
+export PYVERSIONS='3.8 pyston-2.3.5 pypy3.9-7.3.11 3.9 3.10 3.11'