diff --git a/src/md5_gen_fmt.c b/src/md5_gen_fmt.c
index e0900e8..6c8b86c 100644
--- a/src/md5_gen_fmt.c
+++ b/src/md5_gen_fmt.c
@@ -2611,7 +2611,7 @@ void MD5GenBaseFunc__POCrypt()
 	//MD5GenBaseFunc__crypt,
 
 	unsigned i;
-	char *pBuf = input_buf_X86[0];
+	unsigned char *pBuf = input_buf_X86[0];
 	memset(pBuf, 0, sizeof(input_buf_X86[0]));
 	memcpy(pBuf, cursalt, 32);
 	pBuf[32] = 'Y';
diff --git a/src/mkvcalcproba.c b/src/mkvcalcproba.c
index 6ba62a2..b3959bf 100644
--- a/src/mkvcalcproba.c
+++ b/src/mkvcalcproba.c
@@ -16,9 +16,9 @@
 // Later versions of MSVC can handle %lld but some older
 // ones can only handle %I64d.  Easiest to simply use
 // %I64d then all versions of MSVC will handle it just fine
-#define LLd "I64d"
+#define LLd "%I64d"
 #else
-#define LLd "lld"
+#define LLd "%lld"
 #endif
 
 #define MAX_LVL_LEN 28
diff --git a/src/rawMD5go_fmt.c b/src/rawMD5go_fmt.c
index d9b8b9d..6352f43 100644
--- a/src/rawMD5go_fmt.c
+++ b/src/rawMD5go_fmt.c
@@ -67,8 +67,6 @@ static int valid(char *ciphertext)
 	return 1;
 }
 
-static void rawmd5_set_salt(void *salt) { }
-
 static void *rawmd5_binary(char *ciphertext)
 {
 	return fmt_MD5gen.methods.binary(Convert(Conv_Buf, ciphertext));
@@ -95,5 +93,5 @@ static void rawmd5_init(void)
 {
 	md5_gen_RESET_LINK(&fmt_rawMD5go, Convert(Conv_Buf, rawmd5_tests[0].ciphertext), "raw-md5");
 	fmt_rawMD5go.methods.binary = rawmd5_binary;
-	fmt_rawMD5go.methods.salt = fmt_default_salt;
+	fmt_rawMD5go.methods.salt = fmt_MD5gen.methods.salt;
 }