django 1.4 fixes