Update for latest Drupal Core issues