diff --git a/mobile_tools.module b/mobile_tools.module
index 5bf9e7b..e596b53 100755
--- a/mobile_tools.module
+++ b/mobile_tools.module
@@ -198,7 +198,7 @@ function mobile_tools_boot() {
     $redirected = mobile_tools_device_redirect($mobile_tools_device);
   }
 
-  if (mobile_tools_site_type() == 'mobile') {
+  if ($mobile_tools_device['type'] == 'mobile' && mobile_tools_site_type() == 'mobile') {
     $conf['site_frontpage'] = variable_get('site_frontpage_mobile', variable_get('site_frontpage', 'node'));
   }
 
@@ -231,6 +231,11 @@ function mobile_tools_init() {
       $plugin->execute($device['group']);
     }
   }
+
+  // Initialize i18n variables so they are retreived before non translated variables.
+  if (module_exists('i18n')) {
+    i18n_variable_init();
+  }
 }
 
 /**
