diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_build.c b/src/libpts/plugins/imv_attestation/imv_attestation_build.c
index efcb1c695..1efe2e723 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_build.c
+++ b/src/libpts/plugins/imv_attestation/imv_attestation_build.c
@@ -284,10 +284,8 @@ bool imv_attestation_build(linked_list_t *attr_list,
 			}
 			break;
 		}
-		default:
-			DBG1(DBG_IMV, "Attestation IMV is in unknown state: \"%s\"",
-				 handshake_state);
-			return FALSE;
+		case IMV_ATTESTATION_STATE_END:
+			break;
 	}
 	return TRUE;
 }
diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c
index 6469f7cc4..b31ab3dcf 100644
--- a/src/libpts/pts/pts.c
+++ b/src/libpts/pts/pts.c
@@ -1525,7 +1525,7 @@ pts_t *pts_create(bool is_imc)
 		{
 			this->has_tpm = TRUE;
 			this->pcr_len = PCR_LEN;
-			this->proto_caps |= PTS_PROTO_CAPS_T | PTS_PROTO_CAPS_D;
+			/* this->proto_caps |= PTS_PROTO_CAPS_T | PTS_PROTO_CAPS_D; */
 			load_aik(this);
 			load_aik_blob(this);
 		}