more vsval fixes

latest commit dd3a287cb1
Björn Wingman authored