diff --git a/core/hw/sh4/modules/wince.h b/core/hw/sh4/modules/wince.h
index b4fab717a..50a662e68 100644
--- a/core/hw/sh4/modules/wince.h
+++ b/core/hw/sh4/modules/wince.h
@@ -39,7 +39,7 @@ static bool read_mem8(u32 addr, u8& data)
 	return true;
 }
 
-static inline u32 GetCurrentThreadId()
+static inline u32 getCurrentThreadId()
 {
 	u32 addr = PUserKData + SYSHANDLE_OFFSET + SH_CURTHREAD * 4;
 	u32 tid;
@@ -49,7 +49,7 @@ static inline u32 GetCurrentThreadId()
 		return 0;
 }
 
-static inline u32 GetCurrentProcessId()
+static inline u32 getCurrentProcessId()
 {
 	u32 addr = PUserKData + SYSHANDLE_OFFSET + SH_CURPROC * 4;
 	u32 pid;
@@ -294,7 +294,7 @@ static bool print_wince_syscall(u32 address)
 			sprintf(method_buf, "[%d]", meth_id);
 			method = method_buf;
 		}
-		printf("WinCE %08x %04x.%04x %s: %s", address, GetCurrentProcessId() & 0xffff, GetCurrentThreadId() & 0xffff, api, method);
+		printf("WinCE %08x %04x.%04x %s: %s", address, getCurrentProcessId() & 0xffff, getCurrentThreadId() & 0xffff, api, method);
 		if (address == 0xfffffd51)		// SetLastError
 			printf(" dwErrCode = %x\n", r[4]);
 		else if (address == 0xffffd5ef)	// CreateFile
diff --git a/core/rec-x64/rec_x64.cpp b/core/rec-x64/rec_x64.cpp
index 02e2e64cb..9d5acd6b1 100644
--- a/core/rec-x64/rec_x64.cpp
+++ b/core/rec-x64/rec_x64.cpp
@@ -125,9 +125,9 @@ WIN32_ONLY( ".seh_pushreg %r14              \n\t")
 			"movl $" _S(SH4_TIMESLICE) "," _U "cycle_counter(%rip)  \n"
 
 #ifdef _WIN32
-			"movq $" _U "jmp_env, %rcx     \n\t"	// SETJMP
+			"lea " _U "jmp_env(%rip), %rcx	\n\t"	// SETJMP
 #else
-			"movq $" _U "jmp_env, %rdi     \n\t"
+			"lea " _U "jmp_env(%rip), %rdi	\n\t"
 #endif
 			"call " _U "setjmp				\n\t"
 //			"testl %rax, %rax               \n\t"