diff --git a/common/script/i18n.coffee b/common/script/i18n.coffee
index edc3ae02c8..3e9b08f01d 100644
--- a/common/script/i18n.coffee
+++ b/common/script/i18n.coffee
@@ -27,7 +27,7 @@ module.exports =
 
     if string
       try
-        _.template(string, (clonedVars))
+        _.template(string)((clonedVars))
       catch e
         'Error processing the string. Please see Help > Report a Bug.'
     else
@@ -39,6 +39,6 @@ module.exports =
           module.exports.translations[locale].stringNotFound
 
       try
-        _.template(stringNotFound, {string: stringName})
+        _.template(stringNotFound)({string: stringName})
       catch e
         'Error processing the string. Please see Help > Report a Bug.'
diff --git a/common/script/src/i18n.js b/common/script/src/i18n.js
index 315624e76a..3b91ede35b 100644
--- a/common/script/src/i18n.js
+++ b/common/script/src/i18n.js
@@ -25,7 +25,7 @@ module.exports = {
     clonedVars.locale = locale;
     if (string) {
       try {
-        return _.template(string, clonedVars);
+        return _.template(string)(clonedVars);
       } catch (_error) {
         e = _error;
         return 'Error processing the string. Please see Help > Report a Bug.';
@@ -37,7 +37,7 @@ module.exports = {
         stringNotFound = module.exports.translations[locale] && module.exports.translations[locale].stringNotFound;
       }
       try {
-        return _.template(stringNotFound, {
+        return _.template(stringNotFound)({
           string: stringName
         });
       } catch (_error) {
diff --git a/website/public/js/services/guideServices.js b/website/public/js/services/guideServices.js
index e442be6199..a8bd144e52 100644
--- a/website/public/js/services/guideServices.js
+++ b/website/public/js/services/guideServices.js
@@ -184,7 +184,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
   }
 
   _.each(chapters, function(chapter, k){
-    _(chapter).flatten().each(function(step, i) {
+    _(chapter).flattenDeep().each(function(step, i) {
       step.content = "<div><div class='" + (env.worldDmg.guide ? "npc_justin_broken" : "npc_justin") + " float-left'></div>" + step.content + "</div>";
       $(step.element).popover('destroy'); // destroy existing hover popovers so we can add our own
       step.onShow = function(){
@@ -226,7 +226,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
           '<h3 class="popover-title"></h3>' +
           '<div class="popover-content"></div>' +
           '<div class="popover-navigation"> ' +
-            (showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flatten(chapters[k]).length) +'</span>' : '')+ // counter
+            (showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flattenDeep(chapters[k]).length) +'</span>' : '')+ // counter
             '<div class="btn-group">' +
               (step.hideNavigation ? '' : '<button class="btn btn-sm btn-default" data-role="prev">&laquo; Previous</button>') +
               (showFinish ? ('<button class="btn btn-sm btn-primary" data-role="end" style="float:none;">' + (step.proceed ? step.proceed : "Finish Tour") + '</button>') :