Changes for compatibility with Django 1.5