diff --git a/LibreMetaverse/Helpers.cs b/LibreMetaverse/Helpers.cs
index 39a4a100..0b596e27 100644
--- a/LibreMetaverse/Helpers.cs
+++ b/LibreMetaverse/Helpers.cs
@@ -30,7 +30,7 @@ using System.Text;
 using System.IO;
 using System.Reflection;
 using OpenMetaverse.StructuredData;
-using ComponentAce.Compression.Libs.zlib;
+using zlib;
 
 namespace OpenMetaverse
 {
diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj
index a78f83cf..9d160170 100644
--- a/LibreMetaverse/LibreMetaverse.csproj
+++ b/LibreMetaverse/LibreMetaverse.csproj
@@ -95,9 +95,8 @@
       <Name>XMLRPC</Name>
       <Private>False</Private>
     </Reference>
-    <Reference Include="zlib.net">
-      <Name>zlib.net</Name>
-      <Private>False</Private>
+    <Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
+      <HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/LibreMetaverse/Messages/LindenMessages.cs b/LibreMetaverse/Messages/LindenMessages.cs
index 490e2a4d..821ea789 100644
--- a/LibreMetaverse/Messages/LindenMessages.cs
+++ b/LibreMetaverse/Messages/LindenMessages.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.IO;
-using ComponentAce.Compression.Libs.zlib;
+using zlib;
 using OpenMetaverse.StructuredData;
 using OpenMetaverse.Interfaces;
 
diff --git a/LibreMetaverse/packages.config b/LibreMetaverse/packages.config
index f2691dbd..6961f3f4 100644
--- a/LibreMetaverse/packages.config
+++ b/LibreMetaverse/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net40" />
+  <package id="zlib.net" version="1.0.4.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/LibreMetaverseTypes/LibreMetaverseTypes.csproj b/LibreMetaverseTypes/LibreMetaverseTypes.csproj
index 7e94e026..4d8a59c3 100644
--- a/LibreMetaverseTypes/LibreMetaverseTypes.csproj
+++ b/LibreMetaverseTypes/LibreMetaverseTypes.csproj
@@ -69,9 +69,8 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="protobuf-net.dll">
-      <Name>protobuf-net.dll</Name>
-      <Private>False</Private>
+    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.1.0\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -81,8 +80,10 @@
       <Name>System.Core</Name>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BlockingQueue.cs">
diff --git a/LibreMetaverseTypes/packages.config b/LibreMetaverseTypes/packages.config
new file mode 100644
index 00000000..d1887348
--- /dev/null
+++ b/LibreMetaverseTypes/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="protobuf-net" version="2.1.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Programs/WinGridProxy/WinGridProxy.csproj b/Programs/WinGridProxy/WinGridProxy.csproj
index 3d2833d0..2b673b43 100644
--- a/Programs/WinGridProxy/WinGridProxy.csproj
+++ b/Programs/WinGridProxy/WinGridProxy.csproj
@@ -133,22 +133,22 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutBox1.cs">
-      <SubType>Code</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="FireEventAppender.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="FormPluginManager.cs">
-      <SubType>Code</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="FormSessionSearch.cs">
-      <SubType>Code</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="FormWinGridProxy.cs">
-      <SubType>Code</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="ListViewNoFlicker.cs">
-      <SubType>Code</SubType>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
diff --git a/bin/protobuf-net.dll b/bin/protobuf-net.dll
index 55f975d8..94084e53 100644
Binary files a/bin/protobuf-net.dll and b/bin/protobuf-net.dll differ
diff --git a/bin/zlib.net.dll b/bin/zlib.net.dll
index 9d156547..c156f8e7 100755
Binary files a/bin/zlib.net.dll and b/bin/zlib.net.dll differ