Django 1.4 fixes