diff --git a/django_mobile/__init__.py b/django_mobile/__init__.py
index 99d0dcd..c102b28 100644
--- a/django_mobile/__init__.py
+++ b/django_mobile/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __author__ = u'Gregor Müllegger'
-__version__ = '0.7.0.dev1'
+__version__ = '0.7.0.dev2'
 
 
 import threading
diff --git a/django_mobile/loader.py b/django_mobile/loader.py
index f617671..7483f11 100644
--- a/django_mobile/loader.py
+++ b/django_mobile/loader.py
@@ -14,12 +14,12 @@ class Loader(BaseLoader):
     def get_contents(self, origin):
         return origin.loader.get_contents(origin)
 
-    def get_template_sources(self, template_name, template_dirs=None):
+    def get_template_sources(self, template_name):
         template_name = self.prepare_template_name(template_name)
         for loader in self.template_source_loaders:
             if hasattr(loader, 'get_template_sources'):
                 try:
-                    for result in loader.get_template_sources(template_name, template_dirs):
+                    for result in loader.get_template_sources(template_name):
                         yield result
                 except UnicodeDecodeError:
                     # The template dir name was a bytestring that wasn't valid UTF-8.
diff --git a/django_mobile/middleware.py b/django_mobile/middleware.py
index 9ce62bd..56efbce 100644
--- a/django_mobile/middleware.py
+++ b/django_mobile/middleware.py
@@ -2,9 +2,10 @@
 from django_mobile import flavour_storage
 from django_mobile import set_flavour, _init_flavour
 from django_mobile.conf import settings
+from django.utils.deprecation import MiddlewareMixin
 
 
-class SetFlavourMiddleware(object):
+class SetFlavourMiddleware(MiddlewareMixin):
     def process_request(self, request):
         _init_flavour(request)
 
@@ -18,7 +19,7 @@ def process_response(self, request, response):
         return response
 
 
-class MobileDetectionMiddleware(object):
+class MobileDetectionMiddleware(MiddlewareMixin):
     user_agents_test_match = (
         "w3c ", "acs-", "alav", "alca", "amoi", "audi",
         "avan", "benq", "bird", "blac", "blaz", "brew",
@@ -44,7 +45,8 @@ class MobileDetectionMiddleware(object):
     ))
     http_accept_regex = re.compile("application/vnd\.wap\.xhtml\+xml", re.IGNORECASE)
 
-    def __init__(self):
+    def __init__(self, get_response=None):
+        super().__init__(get_response=get_response)
         user_agents_test_match = r'^(?:%s)' % '|'.join(self.user_agents_test_match)
         self.user_agents_test_match_regex = re.compile(user_agents_test_match, re.IGNORECASE)
         self.user_agents_test_search_regex = re.compile(self.user_agents_test_search, re.IGNORECASE)