fixes to django 1.6