some modifications for Django 1.5