fixes for django 1.5 compat