diff --git a/commerce_datatrans.info.yml b/commerce_datatrans.info.yml
index a5f4266fd53c46a3aef5877abb52f8ae56c36e08..d4004695635344e174f54e5d238df09d63a24745 100644
--- a/commerce_datatrans.info.yml
+++ b/commerce_datatrans.info.yml
@@ -2,6 +2,6 @@ name: Commerce Datatrans
 type: module
 description: 'Provides payment gateway for Datatrans.'
 package: Commerce
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
 dependencies:
   - commerce:commerce_payment
diff --git a/src/Plugin/Commerce/PaymentGateway/Datatrans.php b/src/Plugin/Commerce/PaymentGateway/Datatrans.php
index e871560853f95ac72686f0715020af0f191b1dd1..cccc32e1440d4927bc9a0cf3d2cc68ffe90e8d70 100644
--- a/src/Plugin/Commerce/PaymentGateway/Datatrans.php
+++ b/src/Plugin/Commerce/PaymentGateway/Datatrans.php
@@ -241,7 +241,7 @@ class Datatrans extends OffsitePaymentGatewayBase {
     $post_data = $request->request->all();
 
     if (!$this->validateResponseData($post_data, $order)) {
-      drupal_set_message($this->t('There was a problem while processing your payment.'), 'warning');
+      $this->messenger()->addWarning($this->t('There was a problem while processing your payment.'));
       throw new PaymentGatewayException();
     }
 
diff --git a/src/Plugin/Commerce/PaymentMethodType/DatatransAlias.php b/src/Plugin/Commerce/PaymentMethodType/DatatransAlias.php
index 2d4d921ad5ef890a1cac42f3331b289367aa8ad9..08f1a1186d273ac79cef60dc11844672f5957c88 100644
--- a/src/Plugin/Commerce/PaymentMethodType/DatatransAlias.php
+++ b/src/Plugin/Commerce/PaymentMethodType/DatatransAlias.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\commerce_datatrans\Plugin\Commerce\PaymentMethodType;
 
-use Drupal\commerce\BundleFieldDefinition;
+use Drupal\entity\BundleFieldDefinition;
 use Drupal\commerce_payment\Entity\PaymentMethodInterface;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentMethodType\PaymentMethodTypeBase;