fixes for custom issuer handling