diff --git a/src/Form/TypekitIntegrationConfigureForm.php b/src/Form/TypekitIntegrationConfigureForm.php
index 16e24e0..3cf43b2 100644
--- a/src/Form/TypekitIntegrationConfigureForm.php
+++ b/src/Form/TypekitIntegrationConfigureForm.php
@@ -45,7 +45,7 @@ class TypekitIntegrationConfigureForm extends ConfigFormBase {
     return ['typekit_integration.settings'];
   }
 
-  public function buildForm(array $form, \Drupal\Core\Form\FormStateInterface $form_state) {
+  public function buildForm(array $form, FormStateInterface $form_state) {
     $form['typekit_integration_id'] = [
       '#type' => 'textfield',
       '#title' => t('Kit ID'),
@@ -59,7 +59,7 @@ class TypekitIntegrationConfigureForm extends ConfigFormBase {
     return parent::buildForm($form, $form_state);
   }
 
-  public function validateForm(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
+  public function validateForm(array &$form, FormStateInterface $form_state) {
     $api_key = $form_state->getValue(['typekit_integration_id']);
     $pattern = '/^[a-zA-Z0-9-_]+$/';
 
@@ -67,7 +67,7 @@ class TypekitIntegrationConfigureForm extends ConfigFormBase {
       $form_state->setErrorByName('typekit_integration_id', t('Typekit ID should contain only letters and numbers'));
     }
 
-    if (\Drupal\Component\Utility\Unicode::strlen($api_key) != 7) {
+    if (mb_strlen($api_key) != 7) {
       $form_state->setErrorByName('typekit_integration_id', t('Typekit ID should be 7 characters long'));
     }
   }
diff --git a/typekit_integration.info.yml b/typekit_integration.info.yml
index 1fea101..ce59040 100644
--- a/typekit_integration.info.yml
+++ b/typekit_integration.info.yml
@@ -1,4 +1,5 @@
 name: 'Typekit Integration'
 description: 'Adds Adobe Typekit JS to all pages'
 core: 8.x
+core_version_requirement: ^8 || ^9
 type: module
