Fix change to vcsh internals