Many-to-many relationships fixed