diff --git a/message_digest.install b/message_digest.install
index aac89d8..129bf24 100644
--- a/message_digest.install
+++ b/message_digest.install
@@ -150,8 +150,9 @@ function message_digest_update_8100() {
       ],
     ],
   ];
-  db_add_index('message_digest', 'aggregate', ['timestamp', 'sent', 'notifier'], $spec);
-  db_add_index('message_digest', 'sent', ['receiver', 'notifier'], $spec);
+  $connection = \Drupal::database();
+  $connection->schema()->addIndex('message_digest', 'aggregate', ['timestamp', 'sent', 'notifier'], $spec);
+  $connection->schema()->addIndex('message_digest', 'sent', ['receiver', 'notifier'], $spec);
 }
 
 /**
diff --git a/message_digest_ui/message_digest_ui.install b/message_digest_ui/message_digest_ui.install
index e95972a..fdc9ae1 100644
--- a/message_digest_ui/message_digest_ui.install
+++ b/message_digest_ui/message_digest_ui.install
@@ -13,7 +13,8 @@
  */
 function message_digest_ui_install() {
   // Add the `message_digest` field to the user form.
-  $display = entity_get_form_display('user', 'user', 'default');
+  $entityDisplayRepository = \Drupal::service('entity_display.repository');
+  $display = $entityDisplayRepository->getFormDisplay('user', 'user');
   if (!$display->getComponent('message_digest')) {
     $settings = [
       'type' => 'options_select',
@@ -26,7 +27,8 @@ function message_digest_ui_install() {
   // Add the `message_digest` field to flagging types.
   $prefix = \Drupal::config('message_subscribe_email.settings')->get('flag_prefix');
   foreach (['node', 'term', 'user'] as $name) {
-    $display = entity_get_form_display('flagging', $prefix . '_' . $name, 'default');
+    $display = $entityDisplayRepository->getFormDisplay('flagging', $prefix . '_' . $name);
+
     if (!$display->getComponent('message_digest')) {
       $settings = [
         'type' => 'options_select',