diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 33a2c32..2e4d0a6 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -48,11 +48,13 @@ function comment_install() {
 function _comment_get_comment_fields() {
   $fields = entity_load_multiple_by_properties('field_entity', array(
     'type' => 'comment',
+    'include_inactive' => FALSE,
     'include_deleted' => FALSE,
   ));
   foreach ($fields as &$field) {
     $instances = entity_load_multiple_by_properties('field_instance', array(
       'field_uuid' => $field->uuid,
+      'include_inactive' => FALSE,
       'include_deleted' => FALSE,
     ));
     foreach ($instances as $instance) {
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 6555ba8..55539ae 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -21,7 +21,7 @@ function forum_install() {
   // Create the 'taxonomy_forums' field if it doesn't already exist. If forum
   // is being enabled at the same time as taxonomy after both modules have been
   // enabled, the field might exist but still be marked inactive.
-  if (!field_read_field('node', 'taxonomy_forums')) {
+  if (!field_info_field('node', 'taxonomy_forums')) {
     entity_create('field_entity', array(
       'name' => 'taxonomy_forums',
       'entity_type' => 'node',