diff --git a/makefile b/makefile
index fc3d9939c6..ff4de6b9ec 100644
--- a/makefile
+++ b/makefile
@@ -233,7 +233,7 @@ ifeq ($(platform),windows)
 		# ranlib = i586-mingw32msvc-ranlib
 		# strip = i586-mingw32msvc-strip
 	else
-		build-platform = windows
+		build-system = windows
 		common-cflags += "-I$(JAVA_HOME)/include/win32"
 		build-cflags = $(common-cflags) -I$(src) -mthreads
 		ifeq ($(build-platform),cygwin)
diff --git a/src/compile.cpp b/src/compile.cpp
index b9858a1b71..5c80c8de8f 100644
--- a/src/compile.cpp
+++ b/src/compile.cpp
@@ -6134,11 +6134,11 @@ compileVirtualMethod(MyThread* t)
 uint64_t
 invokeNativeFast(MyThread* t, object method, void* function)
 {
-  return reinterpret_cast<FastNativeFunction>(function)
-    (t, method,
-     static_cast<uintptr_t*>(t->stack)
-     + t->arch->frameFooterSize()
-     + t->arch->frameReturnAddressSize());
+  FastNativeFunction f; memcpy(&f, &function, sizeof(void*));
+  return f(t, method,
+           static_cast<uintptr_t*>(t->stack)
+           + t->arch->frameFooterSize()
+           + t->arch->frameReturnAddressSize());
 }
 
 uint64_t