bug fixes; updates for django 1.5