Fixes for Django 1.5