diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index ffeab4e0a..e7552232d 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -198,8 +198,8 @@ sub getEditForm {
 					-size=>7,
 					-value=>$self->getValue($highlight),
 					-subtext=>qq{
-						<A HREF="#" onClick="cp.select($highlight,'$highlight');
-						return false;" NAME="$highlight" ID="$highlight">Pick</A>}
+						<a href="#" onclick="cp.select($highlight,'$highlight');
+						return false;" name="$highlight" id="$highlight">Pick</a>}
 				);
 	}
 	return $tabform;
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 1ea7f275c..a1c4b6eec 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -217,6 +217,7 @@ sub getEditForm {
         	);
 	my $start = $self->getValue("startPoint");
 	$tabform->getTab("properties")->raw("<script type=\"text/javascript\">
+		//<![CDATA[
 		var displayNavDescendantEndPoint = true;
 		var displayNavAncestorEndPoint = true;
 		function toggleDescendantEndPoint () {
@@ -248,6 +249,7 @@ sub getEditForm {
 		changeStartPoint();
 		".($descendantsChecked ? "" : "toggleDescendantEndPoint();")."
 		".($ancestorsChecked ? "" : "toggleAncestorEndPoint();")."
+		//]]>
 		</script>");
 	my $previewButton;# = qq{
                           # <INPUT TYPE="button" VALUE="Preview" NAME="preview"
@@ -256,7 +258,7 @@ sub getEditForm {
                           #      this.form.func.value='preview';
                           #      this.form.target = 'navPreview';
                           #      this.form.submit()">};
-	my $saveButton = ' <input type="button" value="'.WebGUI::International::get(62).'" onClick="
+	my $saveButton = ' <input type="button" value="'.WebGUI::International::get(62).'" onclick="
 		this.value=\''.WebGUI::International::get(452).'\';
 		this.form.func.value=\'editSave\';
 		this.form.target=\'_self\';
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index c8f59df12..ebd68dead 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -207,7 +207,7 @@ sub getEditForm {
 	   if ($nr < 5	and ($self->get("dbQuery".($nr+1)) eq "" || ($self->get("dbQuery".($nr)) eq "" and $self->get("dbQuery".($nr+1)) ne ""))) {
 	           $tabform->getTab("properties")->button(
         	           -value=>WebGUI::International::get('Add another query',"Asset_SQLReport"),
-                	   -extras=>'onClick="toggleQuery(\''.($nr+1).'\'); this.style.display=\'none\';"',
+                	   -extras=>'onclick="toggleQuery(\''.($nr+1).'\'); this.style.display=\'none\';"',
 	                   -noWait=>1
         	           );
 	   }
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 1c02a970d..285ccd0e9 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -320,6 +320,7 @@ WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.c
         my $i18n = WebGUI::International->new("Asset");
         my $output = "
    <script type=\"text/javascript\">
+   //<![CDATA[
      var assetManager = new AssetManager();
          assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
@@ -351,6 +352,7 @@ WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.c
                         for(var i = 0; i < form.assetId.length; i++)
                         form.assetId[i].checked = assetListSelectAllToggle;
                  }
+		 //]]>
                 </script> <div class="adminConsoleSpacer"> &nbsp;</div>';
 	return $ac->render($output, $header);
 }
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 836c8941f..58735cec0 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -198,7 +198,7 @@ sub www_exportStatus {
 	$iframeUrl = WebGUI::URL::append($iframeUrl, 'userId='.$session{form}{userId});
 	$iframeUrl = WebGUI::URL::append($iframeUrl, 'extrasURL='.$session{form}{extrasURL});
 	$iframeUrl = WebGUI::URL::append($iframeUrl, 'uploadsURL='.$session{form}{uploadsURL});
-	my $output = '<IFRAME SRC="'.$iframeUrl.'" TITLE="'.WebGUI::International::get('Page Export Status',"Asset").'" WIDTH="410" HEIGHT="200"></IFRAME>';
+	my $output = '<iframe src="'.$iframeUrl.'" title="'.WebGUI::International::get('Page Export Status',"Asset").'" width="410" height="200"></iframe>';
         $self->getAdminConsole->render($output,WebGUI::International::get('Page Export Status',"Asset"),"Asset");
 }
 
diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm
index 72b7be69a..ae876d039 100644
--- a/lib/WebGUI/Form/TimeField.pm
+++ b/lib/WebGUI/Form/TimeField.pm
@@ -118,7 +118,7 @@ sub toHtml {
 	return $self->SUPER::toHtml
 		.WebGUI::Form::Button->new(
 			id=>$self->{id},
-			extras=>'style="font-size: 8pt;" onClick="window.timeField = this.form.'.$self->{name}.';clockSet = window.open(\''.$session{config}{extrasURL}. '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
+			extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->{name}.';clockSet = window.open(\''.$session{config}{extrasURL}. '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
 			value=>WebGUI::International::get(970)
 			)->toHtml;
 }
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index fe1a92130..a3ecbd9a7 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -207,7 +207,7 @@ sub new {
 	}
 	my $cancel = WebGUI::Form::button({
 			value=>WebGUI::International::get('cancel'),
-			extras=>q|onClick="location.href='|.$cancelUrl.q|'"|
+			extras=>q|onclick="location.href='|.$cancelUrl.q|'"|
 			});
 	bless {	_uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
 }