diff --git a/gcc/shell/cli b/gcc/shell/cli
index 898bd9a..6590a4b 100644
--- a/gcc/shell/cli
+++ b/gcc/shell/cli
@@ -2,6 +2,6 @@
 
 if [[ ! "${configure_flags[*]}" =~ *--prefix* ]]
 then
-  configure_flags+=(--prefix "${install_path}")
+  configure_flags+=( --prefix "${install_path}" )
 fi
 
diff --git a/go/shell/functions b/go/shell/functions
index 6e386f7..7cb3cc3 100644
--- a/go/shell/functions
+++ b/go/shell/functions
@@ -2,12 +2,12 @@
 
 go_fetch()
 {
-  paths enter "${source_path}"
-  if command_exists hg
+  path enter "${source_path}"
+  if command exists hg
   then
-    paths remove "${source_path}/${package_dir}"
-    paths create "${source_path}"
-    paths enter "${source_path}"
+    path remove "${source_path}/${package_dir}"
+    path create "${source_path}"
+    path enter "${source_path}"
     #TODO: use fetch_uri !!!
     hg clone -u release https://go.googlecode.com/hg/ "${source_path}/${package_dir}"
   else
@@ -18,7 +18,7 @@ go_fetch()
 go_build()
 {
   export GOROOT="${source_path}/${package_dir}"
-  paths enter "${source_path}/${package_dir}/src"
+  path enter "${source_path}/${package_dir}/src"
   ./all.bash
 }
 
diff --git a/php/shell/functions b/php/shell/functions
index 313c0fb..10397e9 100644
--- a/php/shell/functions
+++ b/php/shell/functions
@@ -34,8 +34,8 @@ php_postfetch()
 
       for _path in "${source_path}"/${package_dir}/php-trunk*/*
       do
-        mv "$_path"/* "${source_path}/${package_dir}/"
-        remove_path "$_path"
+        files move to "${source_path}/${package_dir}/" "$_path"/*
+        path remove "$_path"
       done
     (5.4*)
       ;;