Fixes necessary for django 1.6 compatibility.