Correct associated objects