diff --git a/Tools/Tcl/build b/Tools/Tcl/build
index 7f4f4da..e157b5a 100755
--- a/Tools/Tcl/build
+++ b/Tools/Tcl/build
@@ -1,6 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
 pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
 pbuild::set_docfiles 'license.terms' 'README'
 
diff --git a/Tools/bash/build b/Tools/bash/build
index df35241..598c0d2 100755
--- a/Tools/bash/build
+++ b/Tools/bash/build
@@ -1,6 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
 pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 pbuild::add_configure_args "--bindir=${PREFIX}/sbin" 
 
diff --git a/Tools/getopt/build b/Tools/getopt/build
index 7a2dd6a..f2a8899 100755
--- a/Tools/getopt/build
+++ b/Tools/getopt/build
@@ -1,6 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
 pbuild::set_download_url "http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz"
 pbuild::compile_in_sourcetree
 
diff --git a/Tools/gettext/build b/Tools/gettext/build
index bb743bd..3d6011d 100755
--- a/Tools/gettext/build
+++ b/Tools/gettext/build
@@ -1,6 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
 pbuild::set_download_url "https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.gz"
 
 pbuild::add_configure_args "--prefix=${PREFIX}"
diff --git a/Tools/modules/build b/Tools/modules/build
index f23a9a5..f213ec4 100755
--- a/Tools/modules/build
+++ b/Tools/modules/build
@@ -3,7 +3,6 @@
 # use system gcc to compile
 declare -rx CC=gcc
 
-pbuild::add_to_group 'Tools'
 pbuild::set_download_url "https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
 
 TCL_DIR="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
diff --git a/build b/build
index 8b3276c..fef86a6 100755
--- a/build
+++ b/build
@@ -101,7 +101,7 @@ pmodules::compile() {
 	build () {
 		local -r name="$1"
 		local -r version=$(get_version "${name}")
-		shift 2
+		shift
 
 		"${BOOTSTRAP_DIR}/Pmodules/modbuild" \
 			"${BOOTSTRAP_DIR}/Tools/${name}/build" \