fixed some Django 1.6 incompatibilities