Tweaks to VC WS api