some fixes for django 1.6+