diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
index 23ffe415a34..d929f0405ff 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
@@ -66,13 +66,9 @@
 
 <?php
 listLogs("$testresults/consolelogs");
-listDetailedLogs($testresults,$expectedTestConfigs[0]);
-listDetailedLogs($testresults,$expectedTestConfigs[1]);
-listDetailedLogs($testresults,$expectedTestConfigs[2]);
-listDetailedLogs($testresults,$expectedTestConfigs[3]);
-listDetailedLogs($testresults,$expectedTestConfigs[4]);
-listDetailedLogs($testresults,$expectedTestConfigs[5]);
-listDetailedLogs($testresults,$expectedTestConfigs[6]);
+foreach ($expectedTestConfigs as $expectedTestConfig) {
+	listDetailedLogs($testresults, $expectedTestConfig);
+}
 ?>
 
 </div>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
index ef1e985a814..47084cfacbd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
@@ -276,7 +276,7 @@ function fileSizeForDisplay($filename) {
  */
 function computeDisplayConfig($config) {
   $lastUnderscore = strrpos ($config, "_");
-  $firstUnderscore = strpos ($config, "_"); 
+  $firstUnderscore = strpos ($config, "_", strpos($config, "x86_64") + 6);
   $platformLength=$lastUnderscore - $firstUnderscore - 1;
   //echo "<br/>DEBUG: config: $config firstUnderscore: $firstUnderscore  lastUnderscore: $lastUnderscore  lastMinusFirst: $platformLength"
   $jobname = substr($config,0,$firstUnderscore);
@@ -293,7 +293,7 @@ function computeDisplayConfig($config) {
    which is 'jobname' on Hudson.
  */
 function jobname($config) {
-  $firstUnderscore = strpos ($config, "_");
+  $firstUnderscore = strpos ($config, "_", strpos($config, "x86_64") + 6);
   $jobname = substr($config,0,$firstUnderscore);
   return $jobname;
 }