diff --git a/src/Form/FeedmineAdminRmprojectForm.php b/src/Form/FeedmineAdminRmprojectForm.php
index 0d5e3c0..277f2a3 100644
--- a/src/Form/FeedmineAdminRmprojectForm.php
+++ b/src/Form/FeedmineAdminRmprojectForm.php
@@ -46,6 +46,8 @@ class FeedmineAdminRmprojectForm extends FormBase {
       }
       else{
         // Notify user before proceeding.
+        // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+        // This needs to be replaced, but Rector was not yet able to replace this because the type of message was set with a variable. If you need to continue to use a variable, you might consider using a switch statement.
         drupal_set_message(t('Unable to assign a Redmine UID.'), $type='warning');
       }
       // Retrieve list of available projects from Redmine.
diff --git a/src/Form/FeedmineBlockContentsForm.php b/src/Form/FeedmineBlockContentsForm.php
index 6751675..18c7d92 100644
--- a/src/Form/FeedmineBlockContentsForm.php
+++ b/src/Form/FeedmineBlockContentsForm.php
@@ -138,7 +138,7 @@ class FeedmineBlockContentsForm extends FormBase {
       $response = \Drupal::httpClient()->post($request_url, $options);
       $data = (string) $response->getBody();
       if(!empty($data)) {
-        drupal_set_message('Thanks for your feedback, an issue has been created.', 'status');
+        $this->messenger()->addStatus('Thanks for your feedback, an issue has been created.');
       }
     }
     catch (RequestException $e) {