diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc
index 2f6610b..f054bf1 100644
--- a/core/modules/field/field.multilingual.inc
+++ b/core/modules/field/field.multilingual.inc
@@ -152,8 +152,8 @@ function _field_language_suggestion($available_langcodes, $langcode_suggestion,
       $langcode_suggestion = $langcode_suggestion[$field_name];
     }
 
-    // If we have a language suggestion and the suggested language is available,
-    // we return only it.
+    // If we have a single language code suggestion and it is available, we just
+    // return it.
     if (in_array($langcode_suggestion, $available_langcodes)) {
       $available_langcodes = array($langcode_suggestion);
     }
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
index 51d3d4f..56961d9 100644
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.install
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
@@ -52,7 +52,7 @@ function _update_7000_field_sql_storage_write($entity_type, $bundle, $entity_id,
         'revision_id' => $revision_id,
         'bundle' => $bundle,
         'delta' => $delta,
-        'language' => $langcode,
+        'langcode' => $langcode,
       );
       foreach ($item as $column => $value) {
         $record[_field_sql_storage_columnname($field_name, $column)] = $value;