diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 820c753ac..0fcab2134 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,9 @@
  - fix: Unable to duplicate existing Session Id
  - fix: Admins not in visitors group
  - fix: Data Form Text Area ignores size settings
+ - Fixed a bug that didn't allow you to search a matrix.
+ - Fixed a bug in the upgrade that caused template problems with the WebGUI 6
+   template if anyone was still using that.
 
 
 7.0.1
diff --git a/docs/upgrades/upgrade_6.99.3-6.99.4.pl b/docs/upgrades/upgrade_6.99.3-6.99.4.pl
index 339319147..7462e22bc 100644
--- a/docs/upgrades/upgrade_6.99.3-6.99.4.pl
+++ b/docs/upgrades/upgrade_6.99.3-6.99.4.pl
@@ -24,7 +24,6 @@ my $session = start(); # this line required
 
 fixSurvey($session);
 fixEditWorkflow($session);
-fixOrphans();
 updateHttpProxy();
 fixShippingOptions();
 
@@ -42,15 +41,6 @@ sub updateHttpProxy {
 	$session->db->write("alter table HttpProxy add column useAmpersand int not null default 0");
 }
 
-#-------------------------------------------------
-sub fixOrphans {
-	print "\tFixing orphans created by 7fixup.\n" unless ($quiet);
-	my $db = $session->db;
-	$db->write("delete from template where assetId='9tBSOV44a9JPS8CcerOvYw'");	
-	$db->write("delete from template where assetId='B1bNjWVtzSjsvGZh9lPz_A'");	
-}
-
-
 #-------------------------------------------------
 sub fixSurvey{
 	my $session = shift;
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index c8e609f7f..eeec1f4ed 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -285,7 +285,7 @@ sub www_compare {
 	$var{isTooMany} = (scalar(@cmsList)>$max);
 	$var{isTooFew} = (scalar(@cmsList)<2);
 	$var{'compare.form'} = $self->getCompareForm(@cmsList);
-	$var{'isLoggedIn'} = ($self->session->user->get("userId") ne "1");
+	$var{'isLoggedIn'} = ($self->session->user->userId ne "1");
 	if ($var{isTooMany} || $var{isTooFew}) {
 		return $self->processStyle($self->processTemplate(\%var,$self->get("compareTemplateId")));
 	}
@@ -920,7 +920,7 @@ sub www_search {
 			$var{isTooFew} = ($count<2);
 		}
 	}
-	$var{'isLoggedIn'} = ($self->session->user->get("userId") ne "1");
+	$var{'isLoggedIn'} = ($self->session->user->userId ne "1");
 	$var{'compare.form'} = $self->getCompareForm(@list);
 	$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
 		.WebGUI::Form::hidden($self->session,{
diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm
index d2c225266..87c2f0858 100644
--- a/lib/WebGUI/Config.pm
+++ b/lib/WebGUI/Config.pm
@@ -32,9 +32,9 @@ This package parses the WebGUI config file.
 
  use WebGUI::Config;
 
- WebGUI::Config::loadAllConfigs($webguiRoot);
+ WebGUI::Config->loadAllConfigs($webguiRoot);
  
- my $configs = WebGUI::Config::readAllConfigs($webguiRoot);
+ my $configs = WebGUI::Config->readAllConfigs($webguiRoot);
 
  my $config = WebGUI::Config->new($webguiRoot, $configFileName);