diff --git a/requirements.txt b/requirements.txt
index 30dd42b5..fea4737e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ psycopg2==2.5.2
 python-social-auth==0.1.23
 simplejson
 South==0.7.6
-django-leaflet-storage==0.6.6
+django-leaflet-storage==0.6.7
 django-pgindex==0.8.2
diff --git a/umap/__init__.py b/umap/__init__.py
index 48f2ede1..af3466c0 100644
--- a/umap/__init__.py
+++ b/umap/__init__.py
@@ -1,5 +1,5 @@
 "Create maps with OpenStreetMap layers in a minute and embed them in your site."
-VERSION = (0, 6, 6)
+VERSION = (0, 6, 7)
 
 __author__ = 'Yohan Boniface'
 __contact__ = "yb@enix.org"
diff --git a/umap/templates/leaflet_storage/js.html b/umap/templates/leaflet_storage/js.html
index f6ce6fb7..9f8f69f2 100644
--- a/umap/templates/leaflet_storage/js.html
+++ b/umap/templates/leaflet_storage/js.html
@@ -16,6 +16,8 @@
     <script src="{{ STATIC_URL }}storage/reqs/label/leaflet.label-src.js"></script>
     <script src="{{ STATIC_URL }}storage/reqs/georsstogeojson/GeoRSSToGeoJSON.js"></script>
     <script src="{{ STATIC_URL }}storage/reqs/heat/leaflet-heat.js"></script>
+    <script src="{{ STATIC_URL }}storage/reqs/togpx/togpx.js"></script>
+    <script src="{{ STATIC_URL }}storage/reqs/tokml/tokml.js"></script>
 {% endcompress %}
 {% if locale %}
     <script src="{{ STATIC_URL }}storage/src/locale/{{ locale }}.js"></script>
diff --git a/umap/views.py b/umap/views.py
index 0a6979c0..eb52422a 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -6,7 +6,7 @@ import socket
 from urlparse import urlparse
 
 from django.views.generic import TemplateView
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.views.generic import DetailView, View
 from django.db.models import Q
 from django.contrib.gis.measure import D
@@ -21,6 +21,8 @@ from pgindex import search as pg_search
 from leaflet_storage.models import Map
 from leaflet_storage.forms import DEFAULT_CENTER
 
+User = get_user_model()
+
 
 class PaginatorMixin(object):
     per_page = 5