diff --git a/.meteor/versions b/.meteor/versions
index 65c64faad..d5fb2edb6 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -122,7 +122,7 @@ rate-limit@1.0.4
 react-meteor-data@0.2.9
 reactive-dict@1.1.7
 reactive-var@1.0.9
-reactrouter:react-router-ssr@3.1.2
+reactrouter:react-router-ssr@3.1.3
 reload@1.1.8
 retry@1.0.7
 routepolicy@1.0.10
@@ -147,7 +147,7 @@ ui@1.0.11
 underscore@1.0.8
 url@1.0.9
 utilities:react-list-container@0.1.12
-utilities:smart-methods@0.1.4
+utilities:smart-methods@0.1.5
 utilities:smart-publications@0.1.4
 webapp@1.2.8
 webapp-hashing@1.0.9
diff --git a/package.json b/package.json
index 9dd3e3183..639c46ebc 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "react-bootstrap-datetimepicker": "0.0.22",
     "react-cookie": "^0.4.6",
     "react-dom": "^15.0.0",
-    "react-intl": "^2.1.2",
+    "react-intl": "^2.1.3",
     "react-komposer": "^1.8.0",
     "react-mounter": "^1.2.0",
     "react-no-ssr": "^1.1.0",
diff --git a/packages/nova-base-components/lib/common/App.jsx b/packages/nova-base-components/lib/common/App.jsx
index 925fbc76f..be06461b7 100644
--- a/packages/nova-base-components/lib/common/App.jsx
+++ b/packages/nova-base-components/lib/common/App.jsx
@@ -25,16 +25,15 @@ class App extends Component {
   }
 
   render() {
-
-    if (this.props.ready) {
-      return (
-        <IntlProvider locale={this.getLocale()} messages={Telescope.strings[this.getLocale()]}>
-          <Telescope.components.Layout currentUser={this.props.currentUser}>{this.props.children}</Telescope.components.Layout>
-        </IntlProvider>
-      )
-    } else {
-      return <Telescope.components.AppLoading />
-    }
+    return (
+      <IntlProvider locale={this.getLocale()} messages={Telescope.strings[this.getLocale()]}>
+        {
+          this.props.ready ? 
+            <Telescope.components.Layout currentUser={this.props.currentUser}>{this.props.children}</Telescope.components.Layout> 
+          : <Telescope.components.AppLoading />
+        }
+      </IntlProvider>
+    )
   }
 
 }
diff --git a/packages/nova-lib/lib/server/intl-polyfill.js b/packages/nova-lib/lib/intl-polyfill.js
similarity index 93%
rename from packages/nova-lib/lib/server/intl-polyfill.js
rename to packages/nova-lib/lib/intl-polyfill.js
index 5675d5f26..c420bcdc1 100644
--- a/packages/nova-lib/lib/server/intl-polyfill.js
+++ b/packages/nova-lib/lib/intl-polyfill.js
@@ -1,7 +1,7 @@
 var areIntlLocalesSupported = require('intl-locales-supported');
 
 var localesMyAppSupports = [
-  Telescope.settings.get("locale")
+  Telescope.settings.get("locale", "en");
 ];
 
 if (global.Intl) {
diff --git a/packages/nova-lib/package.js b/packages/nova-lib/package.js
index b4b1af44a..a50035a84 100644
--- a/packages/nova-lib/package.js
+++ b/packages/nova-lib/package.js
@@ -39,7 +39,7 @@ Package.onUse(function (api) {
     'tmeasday:publish-counts@0.7.3',
     'meteorhacks:unblock@1.1.0',
     // 'kadira:flow-router-ssr@3.13.0',
-    "reactrouter:react-router-ssr@3.1.2",
+    "reactrouter:react-router-ssr@3.1.3",
     // 'kadira:flow-router@2.12.1',
     'utilities:smart-publications@0.1.4',
     'utilities:smart-methods@0.1.4',
@@ -58,12 +58,12 @@ Package.onUse(function (api) {
     'lib/settings.js',
     'lib/collections.js',
     'lib/deep.js',
-    'lib/deep_extend.js'
+    'lib/deep_extend.js',
+    'lib/intl-polyfill.js'
   ], ['client', 'server']);
 
   api.addFiles([
-    'lib/server/server-config.js',
-    'lib/server/intl-polyfill.js'
+    'lib/server/server-config.js'
   ], ['server']);
 
   api.export([