More Django 1.6 fixes