tweaks for django 1.6