diff --git a/html/content.js b/html/content.js
index 44df827..8f3d408 100644
--- a/html/content.js
+++ b/html/content.js
@@ -37,7 +37,7 @@ function setArticle(article) {
         $("article").innerHTML = article.content;
 
         var as = $("article").getElementsByTagName("a");
-        for(var i = 0; i <= as.length; i++) {
+        for(var i = 0; i < as.length; i++) {
             as[i].target = "";
         }
     }
diff --git a/qml/Content.qml b/qml/Content.qml
index 98f213d..119a29f 100644
--- a/qml/Content.qml
+++ b/qml/Content.qml
@@ -59,10 +59,11 @@ Item {
         function setDefaults() {
             // font name needs to be enclosed in single quotes
             // and this is needed for El Capitain because ".SF NS Text" won't work
-            var defFont = ', system, -apple-system, ".SFNSDisplay-Regular", "Helvetica Neue", "Lucida Grande"';
-            webView.runJavaScript("document.body.style.fontFamily = \"'" + fontLabel.font.family + "'" + defFont + "\";");
+            var defFont = ", system, -apple-system, '.SFNSDisplay-Regular', 'Helvetica Neue', 'Lucida Grande'";
+            var font = "'" + fontLabel.font.family + "'" + defFont;
+            webView.runJavaScript("document.body.style.fontFamily = \"" + font + "\";");
             webView.runJavaScript("document.body.style.fontSize = '" + content.textFontSize + "pt';");
-            webView.runJavaScript("setNightmode(" + (content.nightmode ? "true" : "false") + ")")
+            webView.runJavaScript("if(typeof setNightmode == \"function\") setNightmode(" + (content.nightmode ? "true" : "false") + ")")
         }