diff --git a/src/pkcs15init/profile.c b/src/pkcs15init/profile.c
index c212aff1..ac831e22 100644
--- a/src/pkcs15init/profile.c
+++ b/src/pkcs15init/profile.c
@@ -391,7 +391,8 @@ do_card_driver(int argc, char **argv)
 static int
 do_key(int argc, char **argv)
 {
-	unsigned int	type, id, key_len;
+	unsigned int	type, id;
+	size_t		key_len;
 	const char	*key = argv[1];
 	unsigned char	keybuf[32];
 
@@ -815,7 +816,7 @@ do_pin_attempts(int argc, char **argv)
 {
 	struct pin_info	*pi = cur_pin;
 
-	if (get_uint(argv[0], &pi->pin.tries_left))
+	if (get_uint(argv[0], (unsigned int *) &pi->pin.tries_left))
 		return 1;
 	/*
 	pi->puk.tries_left = 0;
diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c
index 04eeca03..8c24e22e 100644
--- a/src/tools/pkcs15-init.c
+++ b/src/tools/pkcs15-init.c
@@ -332,12 +332,12 @@ do_init_app(struct sc_profile *profile)
 		return r;
 
 	memset(&args, 0, sizeof(args));
-	args.so_pin = opt_pins[OPT_PIN2 & 3];
+	args.so_pin = (const u8 *) opt_pins[OPT_PIN2 & 3];
 	if (args.so_pin)
-		args.so_pin_len = strlen(args.so_pin);
-	args.so_puk = opt_pins[OPT_PUK2 & 3];
+		args.so_pin_len = strlen((char *) args.so_pin);
+	args.so_puk = (const u8 *) opt_pins[OPT_PUK2 & 3];
 	if (args.so_puk)
-		args.so_puk_len = strlen(args.so_puk);
+		args.so_puk_len = strlen((char *) args.so_puk);
 	return sc_pkcs15init_add_app(card, profile, &args);
 }