diff --git a/docs/legal.txt b/docs/legal.txt
index ad78a7754..2a440b572 100644
--- a/docs/legal.txt
+++ b/docs/legal.txt
@@ -5,7 +5,8 @@
 WebGUI is Copyright 2001-2006 Plain Black Corporation. All rights 
 reserved.
 
-WebGUI is a trademark of Plain Black Corporation.
+WebGUI Content Engine, WebGUI Runtime Environment, and Plain Black 
+are registered trademarks of Plain Black Corporation.
 
 WebGUI is free software; you can redistribute it and/or modify it 
 under the terms of the GNU General Public License (version 2) as 
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 7d9ffaa7c..813b4845d 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -216,7 +216,7 @@ sub view {
 	}
 	
 	$vars{'addFile.label'} = $i18n->get('add file label');
-	$vars{'addFile.url'} = $self->getUrl('func=add&class=WebGUI::Asset::FilePile');
+	$vars{'addFile.url'} = $self->getUrl('func=add;class=WebGUI::Asset::FilePile');
 	
        	my $out = $self->processTemplate(\%vars,undef,$self->{_viewTemplate});
 	if ($self->session->user->userId eq '1') {
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 838677068..a976c7396 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -115,7 +115,7 @@ sub www_viewStatistics {
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $data);
 	my $i18n = WebGUI::International->new($session);
-	my $url = "http://www.plainblack.com/downloads/latest-version.txt";
+	my $url = "http://update.webgui.org/latest-version.txt";
 	my $cache = WebGUI::Cache->new($session,$url,"URL");
 	my $version = $cache->get;
 	if (not defined $version) {
@@ -127,7 +127,7 @@ sub www_viewStatistics {
 	if ($version ne $WebGUI::VERSION) {
 		my @rev = split(/\./,$version);
 		
-		$version = '<a href="http://files.plainblack.com/downloads/'.$rev[0].'.x.x/webgui-'.$version.'.tar.gz">'.$version.'</a>';
+		$version = '<a href="http://update.webgui.org/'.$rev[0].'.x.x/webgui-'.$version.'.tar.gz">'.$version.'</a>';
 	}
 	$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(349).':</td><td class="tableData">'.$version.'</td></tr>';
 	($data) = $session->db->quickArray("select count(*) from asset where state='published'");
diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl
index 55cad306a..76b7d9e7e 100644
--- a/sbin/testEnvironment.pl
+++ b/sbin/testEnvironment.pl
@@ -238,7 +238,7 @@ sub getLatestWebguiVersion {
         my $referer = "http://".`hostname`."/webgui-cli-version";
         chomp $referer;
         $header->referer($referer);
-        my $currentversionRequest = new HTTP::Request (GET => "http://www.plainblack.com/downloads/latest-version.txt", $header);
+        my $currentversionRequest = new HTTP::Request (GET => "http://update.webgui.org/latest-version.txt", $header);
         my $currentversionResponse = $currentversionUserAgent->request($currentversionRequest);
         my $version = $currentversionResponse->content;
         chomp $version;