Drupal 9 readiness

Make module Drupal 9 compatible