Adjusted some conflicts with Drupal 8.