Fix implementation of Contains and ContainsAll