issuer token fixes