minor fixes for django 1.6.2 also compatibility