diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c
index a4fed756f..abeb7a62a 100644
--- a/libfreerdp/crypto/certificate.c
+++ b/libfreerdp/crypto/certificate.c
@@ -1898,5 +1898,6 @@ X509* freerdp_certificate_get_chain_at(rdpCertificate* certificate, size_t offse
 {
 	WINPR_ASSERT(certificate);
 	WINPR_ASSERT(freerdp_certificate_get_chain_len(certificate) > offset);
-	return sk_X509_value(certificate->chain, offset);
+	const int ioff = WINPR_ASSERTING_INT_CAST(int, offset);
+	return sk_X509_value(certificate->chain, ioff);
 }
diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c
index 03f360810..ddcd63e5e 100644
--- a/winpr/libwinpr/file/generic.c
+++ b/winpr/libwinpr/file/generic.c
@@ -1358,7 +1358,7 @@ HANDLE winpr_CreateFile(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareM
                         LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition,
                         DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
 {
-	char* filename = ConvertUtf8ToWCharAlloc(lpFileName, NULL);
+	WCHAR* filename = ConvertUtf8ToWCharAlloc(lpFileName, NULL);
 	if (!filename)
 		return NULL;