Changes for Django 1.5 compatibility