diff --git a/nodejs.module b/nodejs.module
index cc6c2d1..b08802f 100644
--- a/nodejs.module
+++ b/nodejs.module
@@ -519,7 +519,6 @@ function nodejs_auth_get_token($account) {
  * Default nodejs_auth_get_token() implementation.
  */
 function nodejs_auth_get_token_callback($account) {
-  drupal_session_start();
   return md5($account->getSessionId());
 }
 
@@ -776,12 +775,11 @@ class Nodejs {
 
   public static function httpRequest($url, $options) {
     self::initConfig();
-
-    $request = \Drupal::service('http_default_client')
-      ->createRequest($options['method'], self::$baseUrl . $url, $options['headers'], $options['data']);
+    $request = Drupal::httpClient()->createRequest($options['method'], self::$baseUrl . $url, ['body' => $options['data']]);
+    $request->addHeaders($options['headers']);
 
     try {
-      $response = $request->send();
+      $response = Drupal::httpClient()->send($request);
       if ($response->getStatusCode() != 200) {
         return FALSE;
       }
diff --git a/nodejs_config/lib/Drupal/nodejs_config/Form/NodejsConfigSettingsForm.php b/nodejs_config/lib/Drupal/nodejs_config/Form/NodejsConfigSettingsForm.php
index f70076f..eb3052c 100644
--- a/nodejs_config/lib/Drupal/nodejs_config/Form/NodejsConfigSettingsForm.php
+++ b/nodejs_config/lib/Drupal/nodejs_config/Form/NodejsConfigSettingsForm.php
@@ -27,7 +27,7 @@ class NodejsConfigSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
-    $config = $this->configFactory->get('nodejs_config.settings');
+    $config = $this->config('nodejs_config.settings');
     $suggestion = $config->get('nodejs_config_js_suggestion');
     $file_path = drupal_get_path('module', 'nodejs') . '/nodejs.config.js';
     $config_path_message = $this->t('<ol><li>Configure your server settings in the SETTINGS form below.</li><li>Click the <b>Save Configuration</b> button.</li><li>Copy the suggested configuration lines to <b>!file</b>, you need to do it manually.</li></ol>', array('!file' => $file_path));