diff --git a/contrib/res_limit/main.php b/contrib/res_limit/main.php
index e02169c0..6196b108 100644
--- a/contrib/res_limit/main.php
+++ b/contrib/res_limit/main.php
@@ -20,7 +20,7 @@ class ResolutionLimit implements Extension {
 
 			if($min_w > 0 && $image->width < $min_w) throw new UploadException("Image too small");
 			if($min_h > 0 && $image->height < $min_h) throw new UploadException("Image too small");
-			if($max_w > 0 && $image->width > $min_w) throw new UploadExceptiono("Image too large");
+			if($max_w > 0 && $image->width > $min_w) throw new UploadException("Image too large");
 			if($max_h > 0 && $image->height > $min_h) throw new UploadException("Image too large");
 
 			if(count($ratios) > 0) {
diff --git a/contrib/tag_history/test.php b/contrib/tag_history/test.php
index 3f1dfd33..9e596f0f 100644
--- a/contrib/tag_history/test.php
+++ b/contrib/tag_history/test.php
@@ -1,20 +1,17 @@
 <?php
 class TagHistoryTest extends ShimmieWebTestCase {
 	function testTagHistory() {
-		$this->log_in_as_user();
+		$this->log_in_as_admin();
 		$image_id = $this->post_image("ext/simpletest/data/pbx_screenshot.jpg", "pbx");
 		$this->get_page("post/view/$image_id");
 		$this->assertTitle("Image $image_id: pbx");
-		$this->setField("tags", "new");
+		$this->setField("tag_edit__tags", "new");
 		$this->click("Set");
 		$this->assertTitle("Image $image_id: new");
 		$this->click("Tag History");
-		$this->assertText("new (Set by test");
+		$this->assertText("new (Set by demo");
 		$this->click("Revert");
 		$this->assertTitle("Image $image_id: pbx");
-		$this->log_out();
-
-		$this->log_in_as_admin();
 		$this->delete_image($image_id);
 		$this->log_out();
 	}
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index 606415a3..22930649 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -77,7 +77,7 @@ EOD;
 		$html = "";
 		$i = str_replace(' ', '_', $h) . $salt;
 		if($hidable) $html .= "
-			<script>
+			<script><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
@@ -93,7 +93,7 @@ EOD;
 					$(\"#$i\").hide();
 				}
 			});
-			</script>
+			//--></script>
 		";
 		if(!is_null($h)) $html .= "
 			<div class='hrr' id='$i-toggle'>