many-to-many fixes