Two small bugfixes to make the token helper usable

Hi, I would like to use Vault’s token helper support, but two small bugs prevent me from doing so. I opened pull requests to fix these:

Is there anything I can do to help move this forward?