diff --git a/country.module b/country.module
index 84d978c..094e826 100755
--- a/country.module
+++ b/country.module
@@ -7,6 +7,7 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_help().
@@ -16,7 +17,7 @@ function country_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.country':
       $output = '';
       $output .= '<h3>' . t('Country') . '</h3>';
-      $output .= '<p>' . t('The Country module defines a simple country field type for the Field module. It provides 2 widgets - select options and autocomplete textfield - for this purpose.  See the <a href=":field">Field module help page</a> for more information about fields.', [':field' => \Drupal::url('help.page', ['name' => 'field'])]) . '</p>';
+      $output .= '<p>' . t('The Country module defines a simple country field type for the Field module. It provides 2 widgets - select options and autocomplete textfield - for this purpose.  See the <a href=":field">Field module help page</a> for more information about fields.', [':field' => Url::fromRoute('help.page', ['name' => 'field'])->toString()]) . '</p>';
       return $output;
   }
 }
@@ -45,7 +46,7 @@ function country_field_widget_country_default_form_alter(&$element, FormStateInt
   }
   else {
     $ip = \Drupal::request()->getClientIp();
-    $country_code = ip2country_get_country($ip);
+    $country_code = \Drupal::service('ip2country.manager')->getCountry($ip);
   }
 
   if (in_array($country_code, array_keys($country['#options']))) {
diff --git a/src/Controller/CountryAutocompleteController.php b/src/Controller/CountryAutocompleteController.php
index 7f6dce2..20e8aea 100755
--- a/src/Controller/CountryAutocompleteController.php
+++ b/src/Controller/CountryAutocompleteController.php
@@ -4,7 +4,6 @@ namespace Drupal\country\Controller;
 
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal;
 
@@ -42,7 +41,7 @@ class CountryAutocompleteController {
         $countries = \Drupal::service('country.field.manager')->getSelectableCountries($field_definition);
       }
       foreach ($countries as $iso2 => $country) {
-        if (strpos(Unicode::strtolower($country), Unicode::strtolower($string)) !== FALSE) {
+        if (strpos(mb_strtolower($country), mb_strtolower($string)) !== FALSE) {
           $matches[] = ['value' => $country, 'label' => $country];
         }
       }