diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
index b194faea..78080375 100644
--- a/src/libopensc/card-piv.c
+++ b/src/libopensc/card-piv.c
@@ -3056,7 +3056,7 @@ static int piv_init(sc_card_t *card)
 	}
 	sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "PIV card-type=%d card_issues=0x%08x", card->type, priv->card_issues);
 
-	priv->enumtag = piv_aids[r].enumtag;
+	priv->enumtag = piv_aids[0].enumtag;
 
 	/* PKCS#11 may try to generate session keys, and get confused
 	 * if SC_ALGORITHM_ONBOARD_KEY_GEN is present
@@ -3292,7 +3292,7 @@ static int piv_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
 
 static int piv_logout(sc_card_t *card)
 {
-	int r = 0;
+	int r = SC_ERROR_NOT_SUPPORTED; /* TODO Some PIV cards may support a logout */
 	/* piv_private_data_t * priv = PIV_DATA(card); */
 
 	SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);