diff --git a/connectors/l10n_drupal/l10n_drupal.files.inc b/connectors/l10n_drupal/l10n_drupal.files.inc
index 0c64a2888f14769ed5e873cbc9572dbae7e0a270..b24c9237aa08a608fea67f1f7af9f8a7658c6507 100644
--- a/connectors/l10n_drupal/l10n_drupal.files.inc
+++ b/connectors/l10n_drupal/l10n_drupal.files.inc
@@ -208,10 +208,8 @@ function l10n_drupal_save_data($project_uri, $project_title, $release_version, $
  *   Release object.
  */
 function l10n_drupal_parse_package($package_file, $release) {
-  if (!ini_get('safe_mode')) {
-    // This could take a long time.
-    @set_time_limit(0);
-  }
+  // This could take a long time.
+  @set_time_limit(0);
   $error = $message = '';
 
   // l10n_drupal_requirements() makes sure there is a status
diff --git a/connectors/l10n_gettext/l10n_gettext.module b/connectors/l10n_gettext/l10n_gettext.module
index f2b161880f4254f1f47b2e3d329636a7fdfaf647..66baf7f35c3fb171717a7089e83e90dcb50dafc6 100644
--- a/connectors/l10n_gettext/l10n_gettext.module
+++ b/connectors/l10n_gettext/l10n_gettext.module
@@ -28,9 +28,7 @@ function l10n_gettext_upload_handler($form, $form_state) {
   $validators = array('file_validate_extensions' => array());
   if ($file = file_save_upload('new_source', $validators)) {
     // Increase time limit for PO parsing if possible.
-    if (!ini_get('safe_mode')) {
-      @set_time_limit(240);
-    }
+    @set_time_limit(240);
     $project = $form_state['values']['project'];
     $release = $form_state['values']['new_release'];
 
diff --git a/l10n_community/import.inc b/l10n_community/import.inc
index 1a915d265e981b96860f77f93f283bcaa174de8e..3ceb1d17872860f3aebea6c67c2cd2bd5b0fbfe9 100644
--- a/l10n_community/import.inc
+++ b/l10n_community/import.inc
@@ -127,9 +127,7 @@ function l10n_community_import_form_submit($form, &$form_state) {
   if ($file = file_save_upload('file', $validators)) {
 
     // Increase time limit for PO parsing if possible.
-    if (!ini_get('safe_mode')) {
-      @set_time_limit(240);
-    }
+    @set_time_limit(240);
 
     // Do the actual parsing on the local file.
     if (l10n_server_parse_po($file, '_l10n_community_import_one_string', array($form_state['values']['langcode'], $form_state['values']['is_suggestion'], $form_state['values']['import_uid']))) {
diff --git a/l10n_community/welcome.inc b/l10n_community/welcome.inc
index 7fe76fc4cfb0f3395556032b5483a2d8ae4fc3fe..9561e99cdd6808bd40eaab2b3849a694bab209dd 100644
--- a/l10n_community/welcome.inc
+++ b/l10n_community/welcome.inc
@@ -189,7 +189,9 @@ function l10n_community_pick_go($form, &$form_state) {
   }
   else {
     // Only one language, store as form value.
-    list($language_code, $language_name) = each($language_list);
+    $language_codes = array_keys($language_list);
+    $language_code = array_shift($language_codes);
+    $language_name = $language_list[$language_code];
     $form['langcode'] = array(
       '#type' => 'value',
       '#value' => $language_code,