diff --git a/app/components/TemplateItem.jsx b/app/components/TemplateItem.jsx
index 20aaf8cd6..04e33d40b 100644
--- a/app/components/TemplateItem.jsx
+++ b/app/components/TemplateItem.jsx
@@ -114,7 +114,7 @@ export default class TemplateItem extends React.Component {
                 </SyntaxHighlighter>
               </div>
               <p className="align-right">
-                <a className="faint" href={this.state.template.HistoryUrl}>
+                <a className="faint" href={this.state.template.HistoryUrl} rel="noopener noreferrer" target="_blank">
                   History &raquo;
                 </a>
               </p>
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 17999d44c..82120c4ae 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -31,6 +31,7 @@ import jasmineTerminalReporter from "jasmine-terminal-reporter";
 import eventStream from "event-stream";
 import fs from "fs";
 import jsonlint from "gulp-jsonlint";
+import path from "path";
 
 const sass = gulpSass(dartSass);
 const clientDir = "app";
@@ -292,8 +293,7 @@ function provideMissingData() {
   return eventStream.map(function (file, cb) {
     var fileContent = file.contents.toString();
     var template = JSON.parse(fileContent);
-    var pathParts = file.path.split("\\");
-    var fileName = pathParts[pathParts.length - 1];
+    var fileName = path.basename(file.path);
 
     if (!template.HistoryUrl) {
       template.HistoryUrl = "https://github.com/OctopusDeploy/Library/commits/master/step-templates/" + fileName;