Fix associations