Fix versions, fix if vault is not found.