Django 1.3 fixes