diff --git a/src/root/build.tt b/src/root/build.tt
index 86ae4b2d..18d9aca7 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -326,7 +326,7 @@
                         <td><tt>[% type = input.type; inputTypes.$type %]</tt></td>
                         <td>
                           [% IF input.type == "build" || input.type == "sysbuild" %]
-                            [% INCLUDE renderFullBuildLink build=input.dependency %]</a>
+                            [% INCLUDE renderFullBuildLink build=input.dependency %]
                           [% ELSIF input.type == "string" || input.type == "boolean" %]
                             <tt>"[% input.value %]"</tt>
                           [% ELSE %]
diff --git a/src/root/common.tt b/src/root/common.tt
index 98a37758..19816e4c 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -336,7 +336,7 @@ BLOCK renderDiffUri;
     url = res.0;
     branch = res.1;
     IF bi1.type == "hg" || bi1.type == "git" %]
-      <a target="_new" href="/api/scmdiff?uri=[% url %]&rev1=[% bi1.revision %]&rev2=[% bi2.revision %]&type=[% bi1.type %]&branch=[% branch %]">[% contents %]</a>
+      <a target="_new" href="[% HTML.escape("/api/scmdiff?uri=$url&rev1=$bi1.revision&rev2=$bi2.revision&type=$bi1.type&branch=$branch") %]">[% contents %]</a>
     [% ELSE;
       contents;
     END;
@@ -450,12 +450,12 @@ BLOCK renderEvals %]
       </tr>
     </thead>
     <tbody>
-      [% FOREACH e IN evals
+      [% FOREACH e IN evals;
         eval = e.eval;
         link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]
         <tr class="clickable" onclick="window.location = '[% link %]'">
-          <td><a href="[% link %]">[% eval.id %]</a>&nbsp;</td>
-          <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
+          <td><a href="[% link %]">[% eval.id %]</a></td>
+          <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]</td>
           <td>
             [% IF e.changedInputs.size > 0;
               sep='';
@@ -484,7 +484,7 @@ BLOCK renderEvals %]
         </tr>
       [% END;
       IF linkToAll %]
-        <tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
+        <tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
       [% END %]
     </tbody>
   </table>
diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index 0a80ca32..35a6c18d 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -5,8 +5,7 @@
 
 [% IF otherEval %]
 <p>Comparisons are relative to [% INCLUDE renderFullJobsetName
-project=otherEval.jobset.project.name jobset=otherEval.jobset.name %]
-evaluation <a href="[%
+project=otherEval.jobset.project.name jobset=otherEval.jobset.name %] evaluation <a href="[%
 c.uri_for(c.controller('JobsetEval').action_for('view'),
 [otherEval.id]) %]">[% otherEval.id %]</a>.</p>
 [% END %]
diff --git a/src/root/project.tt b/src/root/project.tt
index fe9ec409..f67b3fed 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -158,10 +158,10 @@
                     [% END %]
                   </p>
 
-                [% END %]
-
           </form>
 
+                [% END %]
+
         </div>
 
         [% IF !edit %]