diff --git a/dumper/dumper.c b/dumper/dumper.c
index 056a55e..d18a108 100644
--- a/dumper/dumper.c
+++ b/dumper/dumper.c
@@ -301,7 +301,7 @@
 	int fText = true;
 
 	for (i = 0; i < cbor->length; i++) {
-		if ((cbor->v.bytes[i] < 32) || (cbor->v.bytes[i] > 126)) fText = false;
+		if ((cbor->v.bytes[i] < 32) || (cbor->v.bytes[i] > 126) || (cbor->v.bytes[i] == '\'')) fText = false;
 	}
 
 	if (fText && (cbor->length > 0)) {
diff --git a/src/Encrypt.c b/src/Encrypt.c
index 36a6bc3..a959866 100644
--- a/src/Encrypt.c
+++ b/src/Encrypt.c
@@ -17,7 +17,7 @@
 bool IsValidEnvelopedHandle(HCOSE_ENVELOPED h)
 {
 	COSE_Enveloped * p = (COSE_Enveloped *)h;
-	return _COSE_IsInList(EnvelopedRoot, &p->m_message);
+	return _COSE_IsInList(EnvelopedRoot, (COSE *) p);
 }
 
 
diff --git a/src/Encrypt0.c b/src/Encrypt0.c
index 3b9c7e6..ca0dfa1 100644
--- a/src/Encrypt0.c
+++ b/src/Encrypt0.c
@@ -18,7 +18,7 @@
 bool IsValidEncryptHandle(HCOSE_ENCRYPT h)
 {
 	COSE_Encrypt * p = (COSE_Encrypt *)h;
-	return _COSE_IsInList(EncryptRoot, &p->m_message);
+	return _COSE_IsInList(EncryptRoot, (COSE *)p);
 }