Drupal 11 compatibility fixes

I have verified MR !2 against Drupal 10 and Drupal 11, functionality is working as expected and module is compatible with Drupal 11.

Moving this to RTBC.

+1 for the changes in !MR3. I can verify that with these changes the module works as intended in Drupal 11.

mattsqd → closed merge request !3

mattsqd → reopened merge request !3

mattsqd → closed merge request !2