fixes for haraka + issuer tokens