diff --git a/src/Iconic.Zlib.Netstandard/DeflateStream.cs b/src/Iconic.Zlib.Netstandard/DeflateStream.cs
index d81bfe9..cc646ff 100644
--- a/src/Iconic.Zlib.Netstandard/DeflateStream.cs
+++ b/src/Iconic.Zlib.Netstandard/DeflateStream.cs
@@ -333,10 +333,9 @@ virtual public FlushType FlushMode
 		///
 		/// <remarks>
 		/// <para>
-		///   The working buffer is used for all stream operations.  The default size is
-		///   1024 bytes.  The minimum size is 128 bytes. You may get better performance
-		///   with a larger buffer.  Then again, you might not.  You would have to test
-		///   it.
+		///   The working buffer is used for all stream operations. The Default size is 8192 bytes
+		///   on NETCF; 16384 bytes otherwise. The minimum size is 128 bytes. You may get better
+		///   performance with a larger buffer. Then again, you might not. You would have to test it.
 		/// </para>
 		///
 		/// <para>
diff --git a/src/Iconic.Zlib.Netstandard/GZipStream.cs b/src/Iconic.Zlib.Netstandard/GZipStream.cs
index 3c379b1..6ff5bd5 100644
--- a/src/Iconic.Zlib.Netstandard/GZipStream.cs
+++ b/src/Iconic.Zlib.Netstandard/GZipStream.cs
@@ -560,10 +560,9 @@ virtual public FlushType FlushMode
 		///
 		/// <remarks>
 		/// <para>
-		///   The working buffer is used for all stream operations.  The default size is
-		///   1024 bytes.  The minimum size is 128 bytes. You may get better performance
-		///   with a larger buffer.  Then again, you might not.  You would have to test
-		///   it.
+		///   The working buffer is used for all stream operations. The Default size is 8192 bytes
+		///   on NETCF; 16384 bytes otherwise. The minimum size is 128 bytes. You may get better
+		///   performance with a larger buffer. Then again, you might not. You would have to test it.
 		/// </para>
 		///
 		/// <para>
diff --git a/src/Iconic.Zlib.Netstandard/ZlibConstants.cs b/src/Iconic.Zlib.Netstandard/ZlibConstants.cs
index c7cc319..bd497c2 100644
--- a/src/Iconic.Zlib.Netstandard/ZlibConstants.cs
+++ b/src/Iconic.Zlib.Netstandard/ZlibConstants.cs
@@ -111,7 +111,7 @@ public static class ZlibConstants
 		public const int Z_BUF_ERROR = -5;
 
 		/// <summary>
-		/// The size of the working buffer used in the ZlibCodec class. Defaults to 8192 bytes.
+		/// The size of the working buffer used in the ZlibCodec class. Defaults to 8192 bytes on NETCF; 16384 bytes otherwise.
 		/// </summary>
 #if NETCF
         public const int WorkingBufferSizeDefault = 8192;
@@ -121,7 +121,7 @@ public static class ZlibConstants
 		/// <summary>
 		/// The minimum size of the working buffer used in the ZlibCodec class.  Currently it is 128 bytes.
 		/// </summary>
-		public const int WorkingBufferSizeMin = 1024;
+		public const int WorkingBufferSizeMin = 128;
 	}
 
 }
diff --git a/src/Iconic.Zlib.Netstandard/ZlibStream.cs b/src/Iconic.Zlib.Netstandard/ZlibStream.cs
index d924d09..084f7e3 100644
--- a/src/Iconic.Zlib.Netstandard/ZlibStream.cs
+++ b/src/Iconic.Zlib.Netstandard/ZlibStream.cs
@@ -342,10 +342,9 @@ public virtual FlushType FlushMode
 		///
 		/// <remarks>
 		/// <para>
-		///   The working buffer is used for all stream operations.  The default size is
-		///   1024 bytes. The minimum size is 128 bytes. You may get better performance
-		///   with a larger buffer.  Then again, you might not.  You would have to test
-		///   it.
+		///   The working buffer is used for all stream operations. The Default size is 8192 bytes
+		///   on NETCF; 16384 bytes otherwise. The minimum size is 128 bytes. You may get better
+		///   performance with a larger buffer. Then again, you might not. You would have to test it.
 		/// </para>
 		///
 		/// <para>