Fixes for Django 1.7 compatibility