Fixes for issuer and audience only being checked when they have values