more django 1.5 fixes