diff --git a/mozilla/java/dom/jni/makefile.win b/mozilla/java/dom/jni/makefile.win
index ab5bdbbb7ab..3da23849687 100755
--- a/mozilla/java/dom/jni/makefile.win
+++ b/mozilla/java/dom/jni/makefile.win
@@ -53,7 +53,7 @@ CPP_OBJS= \
 	.\$(OBJDIR)\org_mozilla_dom_NamedNodeMapImpl.obj \
 	.\$(OBJDIR)\org_mozilla_dom_NodeImpl.obj \
 	.\$(OBJDIR)\org_mozilla_dom_NodeListImpl.obj \
-	.\$(OBJDIR)\org_mozilla_dom_NotationImpl.cpp \
+	.\$(OBJDIR)\org_mozilla_dom_NotationImpl.obj \
 	.\$(OBJDIR)\org_mozilla_dom_ProcessingInstructionImpl.obj \
 	.\$(OBJDIR)\org_mozilla_dom_TextImpl.obj \
  $(NULL)
diff --git a/mozilla/java/dom/nsJavaDOMImpl.cpp b/mozilla/java/dom/nsJavaDOMImpl.cpp
index 7b5e5a42bfc..bb3c227462a 100755
--- a/mozilla/java/dom/nsJavaDOMImpl.cpp
+++ b/mozilla/java/dom/nsJavaDOMImpl.cpp
@@ -108,7 +108,7 @@ nsJavaDOMImpl::nsJavaDOMImpl()
   vm_args.version = 0x00010001;
   vm_args.verifyMode = JNI_TRUE;
 #ifdef DEBUG
-  vm_args.verbose = JNI_TRUE;
+  //  vm_args.verbose = JNI_TRUE;
   vm_args.enableVerboseGC = JNI_TRUE;
 #endif // DEBUG
   char* cp = PR_GetEnv("CLASSPATH");
@@ -126,7 +126,11 @@ nsJavaDOMImpl::nsJavaDOMImpl()
 #ifdef DEBUG
   printf("classpath is \"%s\"\n", vm_args.classpath);
 #endif // DEBUG
+#ifdef XP_PC
+  JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
+#else
   JNI_CreateJavaVM(&jvm, &env, &vm_args);
+#endif
   delete[] p;
 
   gcClass = env->FindClass("org/mozilla/dom/DOMGarbageCollector");