diff --git a/src/tools/gids-tool.c b/src/tools/gids-tool.c
index 63380e9a..53203f22 100644
--- a/src/tools/gids-tool.c
+++ b/src/tools/gids-tool.c
@@ -419,7 +419,7 @@ static int print_info(sc_card_t *card) {
 				}
 				for (i = 0; i < cmaprecordnum; i++) {
 					printf("   container:                  %d\n", i);
-					wprintf(L"      guid:                    %s\n", cmaprecords[i].wszGuid);
+					wprintf(L"      guid:                    %ls\n", cmaprecords[i].wszGuid);
 					printf("      bFlags:                  ");
 					if (cmaprecords[i].bFlags & CONTAINER_MAP_VALID_CONTAINER) {
 						printf("Valid container");
diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
index 8e706208..5f7b6315 100644
--- a/src/tools/pkcs11-tool.c
+++ b/src/tools/pkcs11-tool.c
@@ -3310,7 +3310,7 @@ static int write_object(CK_SESSION_HANDLE session)
 			else if (strncasecmp(opt_key_type, "DES3:", strlen("DES3:")) == 0)
 				type = CKK_DES3;
 			else
-				util_fatal("Unknown key type %s", type);
+				util_fatal("Unknown key type: 0x%X", type);
 		}
 
 		FILL_ATTR(seckey_templ[0], CKA_CLASS, &clazz, sizeof(clazz));