Some fixes to correctly establish/iterate over valuestores