CanadianCase bug fixes