Fix ManyToMany relations