Fixed some compatibility issues with Django 1.7 and 1.8.