Fixed up associations.