diff --git a/src/share/classes/java/io/package.html b/src/share/classes/java/io/package.html
index 31c23d589d0283b8c781af1eeb9bc2160a9633a2..b2f0838bbef393aa979f1478f45a2c0a26e43c0f 100644
--- a/src/share/classes/java/io/package.html
+++ b/src/share/classes/java/io/package.html
@@ -44,7 +44,7 @@ or method in any class or interface in this package will cause a
 For overviews, tutorials, examples, guides, and tool documentation,
 please see:
 <ul>
-  <li><a href="../../../guide/serialization">Serialization Enhancements</a>
+  <li><a href="../../../technotes/guides/serialization">Serialization Enhancements</a>
 </ul>
 
 @since JDK1.0
diff --git a/src/share/native/java/util/zip/Inflater.c b/src/share/native/java/util/zip/Inflater.c
index 7868c7827189fad4684fb69535ec0acd7a274279..78619f4ac0f0d7f9f1bd4ef9c2922251ae511f60 100644
--- a/src/share/native/java/util/zip/Inflater.c
+++ b/src/share/native/java/util/zip/Inflater.c
@@ -38,6 +38,8 @@
 #include "zlib.h"
 #include "java_util_zip_Inflater.h"
 
+#define MIN2(x, y)  ((x) < (y) ? (x) : (y))
+
 #define ThrowDataFormatException(env, msg) \
         JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
 
@@ -128,7 +130,7 @@ Java_java_util_zip_Inflater_inflateBytes(JNIEnv *env, jobject this, jlong addr,
      *
      * Use 20 bytes as the "safe cutoff" number.
      */
-    jint in_len = MIN(this_len, len + 20);
+    jint in_len = MIN2(this_len, len + 20);
     jint consumed;
 
     in_buf = (jbyte *) malloc(in_len);