diff --git a/src/Controller/QuickScriptExecuteController.php b/src/Controller/QuickScriptExecuteController.php
index c89a524..c9c7338 100644
--- a/src/Controller/QuickScriptExecuteController.php
+++ b/src/Controller/QuickScriptExecuteController.php
@@ -41,7 +41,7 @@ class QuickScriptExecuteController extends ControllerBase {
         '#markup' => $result,
       ];
     } catch (\Exception $e) {
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger()->addError($e->getMessage());
       return [
         '#markup' => '',
       ];
diff --git a/src/Form/QuickScriptForm.php b/src/Form/QuickScriptForm.php
index 8d1a55f..702c62d 100644
--- a/src/Form/QuickScriptForm.php
+++ b/src/Form/QuickScriptForm.php
@@ -177,13 +177,13 @@ class QuickScriptForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Quick Script.', [
+        $this->messenger()->addStatus($this->t('Created the %label Quick Script.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Quick Script.', [
+        $this->messenger()->addStatus($this->t('Saved the %label Quick Script.', [
           '%label' => $entity->label(),
         ]));
     }
diff --git a/src/QuickScriptListBuilder.php b/src/QuickScriptListBuilder.php
index dd1de9d..a2660b0 100644
--- a/src/QuickScriptListBuilder.php
+++ b/src/QuickScriptListBuilder.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\quickscript;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Routing\LinkGeneratorTrait;
@@ -51,14 +52,13 @@ class QuickScriptListBuilder extends EntityListBuilder {
   public function buildRow(EntityInterface $entity) {
     /* @var $entity \Drupal\quickscript\Entity\QuickScript */
     $row['id'] = $entity->id();
-    $row['name'] = $this->l(
-      $entity->label(),
-      new Url(
-        'entity.quickscript.edit_form', array(
-          'quickscript' => $entity->id(),
-        )
+    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // Please manually remove the `use LinkGeneratorTrait;` statement from this class.
+    $row['name'] = Link::fromTextAndUrl($entity->label(), new Url(
+      'entity.quickscript.edit_form', array(
+        'quickscript' => $entity->id(),
       )
-    );
+    ));
     $row['machine_name'] = $entity->machine_name->value;
     if ($entity->last_run->value) {
       $row['last_run'] = \Drupal::service('date.formatter')->formatTimeDiffSince($entity->last_run->value) . ' ago';
@@ -74,10 +74,12 @@ class QuickScriptListBuilder extends EntityListBuilder {
    */
   protected function getDefaultOperations(EntityInterface $entity) {
     $operations = parent::getDefaultOperations($entity);
+    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // Please confirm that `$entity` is an instance of `Drupal\Core\Entity\EntityInterface`. Only the method name and not the class name was checked for this replacement, so this may be a false positive.
     $operations['run'] = [
       'title' => $this->t('Run'),
       'weight' => 0,
-      'url' => $entity->urlInfo('execute'),
+      'url' => $entity->toUrl('execute'),
     ];
     return $operations;
   }