Fixed count issues and partner save issues.