fixes for django 1.7