diff --git a/templates/article/article.tpl b/templates/article/article.tpl
index cc5f616..af05df2 100644
--- a/templates/article/article.tpl
+++ b/templates/article/article.tpl
@@ -16,19 +16,19 @@
 	{elseif $galley->isPdfGalley()}
 		{url|assign:"pdfUrl" op="viewFile" path=$articleId|to_array:$galley->getBestGalleyId($currentJournal)}
 		{translate|assign:"noPluginText" key='article.pdf.pluginMissing'}
-		<script type="text/javascript">{literal}
+		<script type="text/javascript"><!--{literal}
 			$(document).ready(function(){
 				if ($.browser.webkit) { // PDFObject does not correctly work with safari's built-in PDF viewer
-					var embedCode = "<object id='pdfObject' type='application/pdf' data='{/literal}{$pdfUrl}{literal}' width='99%' height='99%'><div id='pluginMissing'>{/literal}{$noPluginText|escape}{literal}</div></object>";
+					var embedCode = "<object id='pdfObject' type='application/pdf' data='{/literal}{$pdfUrl}{literal}' width='99%' height='99%'><div id='pluginMissing'>{/literal}{$noPluginText|escape:'javascript'}{literal}</div></object>";
 					$("#articlePdf").html(embedCode);
 					if($("#pluginMissing").is(":hidden")) {
 						$('#fullscreenShow').show();
 						$("#articlePdf").resizable({ containment: 'parent', handles: 'se' });
 					} else { // Chrome Mac hides the embed object, obscuring the text.  Reinsert.
-						$("#articlePdf").html('{/literal}{$noPluginText}{literal}');
+						$("#articlePdf").html('{/literal}{$noPluginText|escape:"javascript"}{literal}');
 					}
 				} else {
-					var success = new PDFObject({ url: "{/literal}{$pdfUrl}{literal}" }).embed("articlePdf");
+					var success = new PDFObject({ url: "{/literal}{$pdfUrl|escape:'javascript'}{literal}" }).embed("articlePdf");
 					if (success) {
 						// PDF was embedded; enbale fullscreen mode and the resizable widget
 						$('#fullscreenShow').show();
@@ -36,7 +36,7 @@
 					}
 				}
 			});
-		{/literal}</script>
+		{/literal}--></script>
 		<div id="articlePdfResizer">
 			<div id="articlePdf" class="ui-widget-content">
 				{translate key="article.pdf.pluginMissing"}
diff --git a/templates/article/footer.tpl b/templates/article/footer.tpl
index 0df67c0..db10f7b 100644
--- a/templates/article/footer.tpl
+++ b/templates/article/footer.tpl
@@ -52,7 +52,6 @@
 
 </div>
 </div>
-</div>
 
 {if $defineTermsContextId}
 <script type="text/javascript">
diff --git a/templates/article/header.tpl b/templates/article/header.tpl
index 52cdcf9..fd179f3 100644
--- a/templates/article/header.tpl
+++ b/templates/article/header.tpl
@@ -44,7 +44,7 @@
 	{/foreach}
 
 	<!-- Base Jquery -->
-	{if $allowCDN}<script src="http://www.google.com/jsapi"></script>
+	{if $allowCDN}<script type="text/javascript" src="http://www.google.com/jsapi"></script>
 	<script type="text/javascript">{literal}
 		// Provide a local fallback if the CDN cannot be reached
 		if (typeof google == 'undefined') {
diff --git a/templates/rt/header.tpl b/templates/rt/header.tpl
index 623ac0e..22a7680 100644
--- a/templates/rt/header.tpl
+++ b/templates/rt/header.tpl
@@ -25,7 +25,7 @@
 	{/foreach}
 
 	<!-- Base Jquery -->
-	{if $allowCDN}<script src="http://www.google.com/jsapi"></script>
+	{if $allowCDN}<script type="text/javascript" src="http://www.google.com/jsapi"></script>
 	<script type="text/javascript">{literal}
 		// Provide a local fallback if the CDN cannot be reached
 		if (typeof google == 'undefined') {
diff --git a/templates/submission/comment/header.tpl b/templates/submission/comment/header.tpl
index 084698e..cb6941c 100644
--- a/templates/submission/comment/header.tpl
+++ b/templates/submission/comment/header.tpl
@@ -25,7 +25,7 @@
 	{/foreach}
 
 	<!-- Base Jquery -->
-	{if $allowCDN}<script src="http://www.google.com/jsapi"></script>
+	{if $allowCDN}<script type="text/javascript" src="http://www.google.com/jsapi"></script>
 	<script type="text/javascript">{literal}
 		// Provide a local fallback if the CDN cannot be reached
 		if (typeof google == 'undefined') {