Port over fixes from PropertyValueProposal