Bugfixes, mainly because of list wrapper and keeping track of user references to value sets.