diff --git a/include/testData.php b/include/testData.php
index 00afefe..695b808 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -567,7 +567,7 @@ class testData{
 
         echo '<br />',"\n"; // put a space after the test results table and the button
 
-        echo '<form method=get action="'.$PHP_SELF.'">'."\n";
+        echo '<form method=get action="'.$_SERVER['PHP_SELF'].'">'."\n";
         echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n";
         if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll))
             echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n";
diff --git a/objectManager.php b/objectManager.php
index ba541cf..22eda2a 100644
--- a/objectManager.php
+++ b/objectManager.php
@@ -85,7 +85,7 @@ if($oObject->iId)
         break;
 
         case "edit":
-        $oObject->display_entry_for_editing($REQUEST_URI, $sErrors);
+        $oObject->display_entry_for_editing($_SERVER['REQUEST_URI'], $sErrors);
         break;
 
         case "showMoveChildren":
@@ -93,12 +93,12 @@ if($oObject->iId)
         break;
 
         default:
-        $oObject->view($REQUEST_URI);
+        $oObject->view($_SERVER['REQUEST_URI']);
         break;
     }
 } else if ($aClean['sAction'] == "add")
 {
-    $oObject->add_entry($REQUEST_URI, $sErrors);
+    $oObject->add_entry($_SERVER['REQUEST_URI'], $sErrors);
 } else
 {
     // if displaying a queue display the help for the given queue