diff --git a/faq/admin.py b/faq/admin.py
index d18b50d..5d5f61c 100644
--- a/faq/admin.py
+++ b/faq/admin.py
@@ -8,6 +8,7 @@ class QuestionAdmin(admin.ModelAdmin):
     list_display = ['text', 'sort_order', 'created_by', 'created_on',
                     'updated_by', 'updated_on', 'status']
     list_editable = ['sort_order', 'status']
+    raw_id_fields = ['created_by', 'updated_by']
 
     def save_model(self, request, obj, form, change): 
         '''
diff --git a/faq/managers.py b/faq/managers.py
index 2cea25c..7e81507 100644
--- a/faq/managers.py
+++ b/faq/managers.py
@@ -9,8 +9,8 @@ def active(self):
         return self.filter(status__exact=self.model.ACTIVE)
 
 class QuestionManager(models.Manager):
-    def get_query_set(self):
+    def get_queryset(self):
         return QuestionQuerySet(self.model)
 
     def active(self):
-        return self.get_query_set().active()
\ No newline at end of file
+        return self.get_queryset().active()
diff --git a/faq/models.py b/faq/models.py
index 689fc61..bcd4d6f 100644
--- a/faq/models.py
+++ b/faq/models.py
@@ -1,9 +1,15 @@
-import datetime
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth import get_user_model
 from django.template.defaultfilters import slugify
 from managers import QuestionManager
+from django.conf import settings
+
+if settings.USE_TZ:
+    from django.utils.timezone import now as datetime_now
+else:
+    import datetime
+    datetime_now = datetime.datetime.now
 
 User = get_user_model()
 
@@ -53,7 +59,7 @@ class Question(models.Model):
     sort_order = models.IntegerField(_('sort order'), default=0,
         help_text=_('The order you would like the question to be displayed.'))
 
-    created_on = models.DateTimeField(_('created on'), default=datetime.datetime.now)
+    created_on = models.DateTimeField(_('created on'), default=datetime_now)
     updated_on = models.DateTimeField(_('updated on'))
     created_by = models.ForeignKey(User, verbose_name=_('created by'),
         null=True, related_name="+")
@@ -72,7 +78,7 @@ def __unicode__(self):
 
     def save(self, *args, **kwargs):
         # Set the date updated.
-        self.updated_on = datetime.datetime.now()
+        self.updated_on = datetime_now()
         
         # Create a unique slug, if needed.
         if not self.slug:
diff --git a/faq/urls.py b/faq/urls.py
index 194cfe3..0cdbaa7 100644
--- a/faq/urls.py
+++ b/faq/urls.py
@@ -1,6 +1,12 @@
 from __future__ import absolute_import
 
-from django.conf.urls.defaults import *
+try:
+    # Django > 1.6
+    from django.conf.urls import patterns, include, url
+except ImportError:
+    # Django < 1.6
+    from django.conf.urls.defaults import patterns, include, url
+
 from . import views as faq_views
 
 urlpatterns = patterns('',
@@ -24,4 +30,4 @@
         view  = faq_views.QuestionDetail.as_view(),
         name  = 'faq_question_detail',
     ),
-)
\ No newline at end of file
+)