Many to Many fixes