Fix bugs in ProductValue operations (still broken)