diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index e126386e6..31f8b0de6 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -52,12 +52,12 @@ sub _drawQueryBuilder {
 	}
 
 	# Static form fields
-	my $shortcutCriteriaField = WebGUI::Form::textarea({
+	my $shortcutCriteriaField = WebGUI::Form::textarea($self->session, {
 		name=>"shortcutCriteria",
 		value=>$self->getValue("shortcutCriteria"),
 		extras=>'style="width: 100%" '.$self->{_disabled}
 	});
-	my $conjunctionField = WebGUI::Form::selectBox({
+	my $conjunctionField = WebGUI::Form::selectBox($self->session, {
 		name=>"conjunction",
 		options=>{
 			"AND" => $i18n->get("AND"),
@@ -83,7 +83,7 @@ sub _drawQueryBuilder {
 
 		# The operator select field
 		my $opFieldName = "op_field".$i;
-		my $opField = WebGUI::Form::selectList({
+		my $opField = WebGUI::Form::selectList($self->session, {
 			name=>$opFieldName,
 			uiLevel=>5,
 			options=>$operator{$fieldType},
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index ca3289dd1..6b99e95b5 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -105,7 +105,7 @@ sub www_editBranch {
                 -label=>$i18n->get(104),
                 -uiLevel=>9,
 		-subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_url"}),
-		-value=>WebGUI::Form::selectBox({
+		-value=>WebGUI::Form::selectBox($self->session, {
                 	name=>"baseUrlBy",
 			extras=>'onchange="toggleSpecificBaseUrl()"',
 			id=>"baseUrlBy",
@@ -114,7 +114,7 @@ sub www_editBranch {
 				specifiedBase=>"Specified Base",
 				none=>"None"
 				}
-			}).'<span id="baseUrl"></span> / '.WebGUI::Form::selectBox({
+			}).'<span id="baseUrl"></span> / '.WebGUI::Form::selectBox($self->session, {
 				name=>"endOfUrl",
 				options=>{
 					menuTitle=>$i18n->get(411),
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 1c04db75f..b74c06881 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -211,7 +211,7 @@ sub www_manageTrash {
 		my $title = $child->getTitle;
                 $title =~ s/\'/\\\'/g;
          	$output .= "assetManager.AddLine('"
-			.WebGUI::Form::checkbox({
+			.WebGUI::Form::checkbox($self->session, {
 				name=>'assetId',
 				value=>$child->getId
 				})
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 36b91c277..a19171dc2 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -216,7 +216,7 @@ sub createAccount {
 	$vars->{'create.form.ldapConnection.label'} = $i18n->get("ldapConnection");
 	
 	my $url = $self->session->url->page("op=auth;method=createAccount;connection=");
-	$vars->{'create.form.ldapConnection'} = WebGUI::Form::selectBox({
+	$vars->{'create.form.ldapConnection'} = WebGUI::Form::selectBox($self->session, {
 	                name=>"ldapConnection",
 					options=>WebGUI::LDAPLink->getList($self->session,),
 					value=>[$connection->{ldapLinkId}],
@@ -362,7 +362,7 @@ sub editUserFormSave {
 sub editUserSettingsForm {
    my $self = shift;
    my $f = WebGUI::HTMLForm->new($self->session);
-   my $ldapConnection = WebGUI::Form::selectBox({
+   my $ldapConnection = WebGUI::Form::selectBox($self->session, {
 	                name=>"ldapConnection",
 					options=>WebGUI::LDAPLink->getList($self->session,),
 					value=>[$self->session->setting->get("ldapConnection")]
diff --git a/lib/WebGUI/Macro/D_date.pm b/lib/WebGUI/Macro/D_date.pm
index 488d90cd0..cc22c8342 100644
--- a/lib/WebGUI/Macro/D_date.pm
+++ b/lib/WebGUI/Macro/D_date.pm
@@ -25,7 +25,7 @@ Macro for displaying dates formatted for reading by people using $session->datet
 =head3 format string
 
 A string specifying how to format the date using codes similar to those used by
-sprintf.  See L<WebGUI::DateTime/"epochToHuman"> for a list of codes.
+sprintf.  See L<WebGUI::Session::datetime/"epochToHuman"> for a list of codes.
 
 =head3 date
 
diff --git a/lib/WebGUI/Macro/LastModified.pm b/lib/WebGUI/Macro/LastModified.pm
index bc4b19df1..dfa0d29db 100644
--- a/lib/WebGUI/Macro/LastModified.pm
+++ b/lib/WebGUI/Macro/LastModified.pm
@@ -31,7 +31,7 @@ Text to prepend to the date.  This can be the empty string.
 =head3 format string
 
 A string specifying how to format the date using codes similar to those used by
-sprintf.  See L<WebGUI::DateTime/"epochToHuman"> for a list of codes.  Uses
+sprintf.  See L<WebGUI::Session::datetime/"epochToHuman"> for a list of codes.  Uses
 "%z" if empty.
 
 =cut