Fixes related to Value Multiplicity