diff --git a/src/Core/Formatter/FormatterManager.php b/src/Core/Formatter/FormatterManager.php
index 0c6c55fc0..7ca65cce6 100644
--- a/src/Core/Formatter/FormatterManager.php
+++ b/src/Core/Formatter/FormatterManager.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Core\Formatter;
 
-use Illuminate\Container\Container;
+use Illuminate\Contracts\Container\Container;
 
 class FormatterManager
 {
@@ -9,19 +9,18 @@ class FormatterManager
     /**
      * The IoC container instance.
      *
-     * @var \Illuminate\Container\Container
+     * @var \Illuminate\Contracts\Container\Container
      */
     protected $container;
 
     /**
      * Create a new formatter manager instance.
      *
-     * @param  \Illuminate\Container\Container  $container
-     * @return void
+     * @param  \Illuminate\Contracts\Container\Container  $container
      */
-    public function __construct(Container $container = null)
+    public function __construct(Container $container)
     {
-        $this->container = $container ?: new Container;
+        $this->container = $container;
     }
 
     public function add($name, $formatter, $priority = 0)
diff --git a/src/Core/Handlers/Events/EmailConfirmationMailer.php b/src/Core/Handlers/Events/EmailConfirmationMailer.php
index c0c11aafa..ff6d6f896 100755
--- a/src/Core/Handlers/Events/EmailConfirmationMailer.php
+++ b/src/Core/Handlers/Events/EmailConfirmationMailer.php
@@ -1,10 +1,10 @@
 <?php namespace Flarum\Core\Handlers\Events;
 
-use Illuminate\Mail\Mailer;
+use Config;
 use Flarum\Core\Events\UserWasRegistered;
 use Flarum\Core\Events\EmailWasChanged;
-use Config;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Mail\Mailer;
 
 class EmailConfirmationMailer
 {
diff --git a/src/Core/Notifications/NotificationMailer.php b/src/Core/Notifications/NotificationMailer.php
index 8baef1a92..7c3821522 100644
--- a/src/Core/Notifications/NotificationMailer.php
+++ b/src/Core/Notifications/NotificationMailer.php
@@ -2,7 +2,7 @@
 
 use Flarum\Core\Models\User;
 use Flarum\Core\Models\Forum;
-use Illuminate\Mail\Mailer;
+use Illuminate\Contracts\Mail\Mailer;
 
 class NotificationMailer
 {