Initial fixes for django 1.5