diff --git a/object_log.module b/object_log.module
index e62cd79..699e1e7 100644
--- a/object_log.module
+++ b/object_log.module
@@ -12,7 +12,7 @@
 function object_log($label, $data) {
   $fields = array(
     'data' => serialize($data),
-    'created' => REQUEST_TIME,
+    'created' => \Drupal::time()->getRequestTime(),
   );
   db_merge('object_log')
     ->keys(array('label' => $label))
@@ -30,7 +30,9 @@ function object_log($label, $data) {
  *   stored object.
  */
 function object_log_retrieve($label) {
-  $result = db_query('SELECT label, data, created FROM {object_log} WHERE label = :label', array(':label' => $label));
+  // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+  // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+  $result = \Drupal::database()->query('SELECT label, data, created FROM {object_log} WHERE label = :label', array(':label' => $label));
   $log = $result->fetchObject();
   if (empty($log->data)) {
     return FALSE;
@@ -43,5 +45,7 @@ function object_log_retrieve($label) {
  * Clear the object log.
  */
 function object_log_clear_log() {
-  db_delete('object_log')->execute();
+  // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+  // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+  \Drupal::database()->delete('object_log')->execute();
 }
diff --git a/src/Controller/ObjectLogController.php b/src/Controller/ObjectLogController.php
index e092ef3..a241e8a 100644
--- a/src/Controller/ObjectLogController.php
+++ b/src/Controller/ObjectLogController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\object_log\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Datetime\DateFormatter;
@@ -98,8 +99,10 @@ class ObjectLogController extends ControllerBase {
       ->execute();
 
     foreach ($result as $item) {
+      // 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.
       $rows[] = array(
-        $this->l($item->label, Url::fromRoute('object_log.object', array('label' => $item->label))),
+        Link::fromTextAndUrl($item->label, Url::fromRoute('object_log.object', array('label' => $item->label))),
         $this->dateFormatter->format($item->created, 'short'),
       );
     }
diff --git a/src/Form/ObjectLogClearLogForm.php b/src/Form/ObjectLogClearLogForm.php
index 0c9e4eb..d4386fd 100644
--- a/src/Form/ObjectLogClearLogForm.php
+++ b/src/Form/ObjectLogClearLogForm.php
@@ -64,7 +64,7 @@ class ObjectLogClearLogForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->database->delete('object_log')->execute();
-    drupal_set_message($this->t('Object log cleared.'));
+    $this->messenger()->addStatus($this->t('Object log cleared.'));
   }
 
 }