Fixes for Django 1.6