Changes to cope with Django 1.7