Fixing spec failures.
Fixing various associations.