Updates for django 1.4