Drupal 9 compatibility fixes and all working features tested