Jws/Jwe updates