Drupal 9 compatibility fixes