diff --git a/src/classpath-common.h b/src/classpath-common.h
index 99e042162c..5f769ae00f 100644
--- a/src/classpath-common.h
+++ b/src/classpath-common.h
@@ -120,6 +120,16 @@ void
 runOnLoadIfFound(Thread* t, System::Library* library)
 {
   void* p = library->resolve("JNI_OnLoad");
+
+#ifdef PLATFORM_WINDOWS
+  if (p == 0) {
+    p = library->resolve("_JNI_OnLoad@8");
+    if (p == 0) {
+      p = library->resolve("JNI_OnLoad@8");
+    }
+  }
+#endif
+
   if (p) {
     jint (JNICALL * JNI_OnLoad)(Machine*, void*);
     memcpy(&JNI_OnLoad, &p, sizeof(void*));
diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index feb468b083..cbb705d8d9 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -1747,7 +1747,7 @@ loadLibrary(Thread* t, object, uintptr_t* arguments)
  
   loadLibrary
     (t, static_cast<local::MyClasspath*>(t->m->classpath)->libraryPath,
-     RUNTIME_ARRAY_BODY(n), not absolute, false);
+     RUNTIME_ARRAY_BODY(n), not absolute, true);
 }
 
 // only safe to call during bootstrap when there's only one thread