more fixing for django 1.5