diff --git a/core/src/main/resources/template/ajax/head.ftl b/core/src/main/resources/template/ajax/head.ftl
index 4eb0ed8d4..bd85e3b49 100644
--- a/core/src/main/resources/template/ajax/head.ftl
+++ b/core/src/main/resources/template/ajax/head.ftl
@@ -1,6 +1,6 @@
 <#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
 <script language="JavaScript" type="text/javascript"
-        src="<@s.url includeParams='none' value='/struts/ajax/dojoRequire.js' includeParams='none' encode='false'  />"></script>
+        src="<@s.url value='/struts/ajax/dojoRequire.js' includeParams='none' encode='false'  />"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@s.url includeParams='none' value='/struts/CommonFunctions.js' includeParams='none' encode='false'/>"></script>
+        src="<@s.url value='/struts/CommonFunctions.js' includeParams='none' encode='false'/>"></script>
diff --git a/core/src/main/resources/template/simple/head.ftl b/core/src/main/resources/template/simple/head.ftl
index 59ed379c9..91c05dcb8 100644
--- a/core/src/main/resources/template/simple/head.ftl
+++ b/core/src/main/resources/template/simple/head.ftl
@@ -2,7 +2,7 @@
     // Dojo configuration
     djConfig = {
         baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
-        isDebug: ${parameters.debug},
+        isDebug: ${parameters.debug?default(false)},
         bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
     };