Fix associations, etc...