diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c
index 53da8529..0032a231 100644
--- a/src/libopensc/card-entersafe.c
+++ b/src/libopensc/card-entersafe.c
@@ -913,7 +913,7 @@ static int entersafe_decipher(sc_card_t *card,
 	 return entersafe_compute_with_prkey(card,crgram,crgram_len,out,outlen);
 }
 
-static int entersafe_init_pin_info(struct sc_pin_cmd_pin *pin, unsigned int num)
+static void entersafe_init_pin_info(struct sc_pin_cmd_pin *pin, unsigned int num)
 {
 	pin->encoding   = SC_PIN_ENCODING_ASCII;
 	pin->min_length = 4;
diff --git a/src/libopensc/card-gemsafeV1.c b/src/libopensc/card-gemsafeV1.c
index 3c30d136..60ec8bb1 100644
--- a/src/libopensc/card-gemsafeV1.c
+++ b/src/libopensc/card-gemsafeV1.c
@@ -332,7 +332,7 @@ static int gemsafe_process_fci(struct sc_card *card, struct sc_file *file,
 
 	tag = sc_asn1_find_tag(ctx, p, len, 0x8C, &tlen);
 	if (tag) {
-		r = gemsafe_setacl(card, file, tag, type == "DF" ? 1 : 0);
+		r = gemsafe_setacl(card, file, tag, strcmp(type, "DF") ? 0 : 1);
 		if (r < 0) {
 			sc_debug(ctx, "unable to set ACL\n");
 			return SC_ERROR_INTERNAL;