diff --git a/applications/Decoder/Decoder.build b/applications/Decoder/Decoder.build
index d92eeb94..0262010c 100644
--- a/applications/Decoder/Decoder.build
+++ b/applications/Decoder/Decoder.build
@@ -74,7 +74,7 @@
   <!-- build tasks -->
   <target
     name="build"
-    depends="init build-dll"
+    depends="init"
     description="Builds the binaries for the current configuration">
     <echo message="Build Directory is ${bin_dir}/" />
     <mkdir
@@ -93,14 +93,6 @@
     </csc>
   </target>
 
-  <target
-    name="build-dll"
-    description="Builds libsecondlife dll">
-    <nant
-      buildfile="../../libsecondlife-cs/libsecondlife.build"
-      target="${project.config} build"/>
-  </target>
-
   <target
     name="clean"
     depends="init"
diff --git a/applications/TestBot/TestBot.build b/applications/TestBot/TestBot.build
index 80d90780..ef802e94 100644
--- a/applications/TestBot/TestBot.build
+++ b/applications/TestBot/TestBot.build
@@ -74,7 +74,7 @@
   <!-- build tasks -->
   <target
     name="build"
-    depends="init build-dll"
+    depends="init"
     description="Builds the binaries for the current configuration">
     <echo message="Build Directory is ${bin_dir}/" />
     <mkdir
@@ -93,14 +93,6 @@
     </csc>
   </target>
 
-  <target
-    name="build-dll"
-    description="Builds libsecondlife dll">
-    <nant
-      buildfile="../../libsecondlife-cs/libsecondlife.build"
-      target="${project.config} build"/>
-  </target>
-
   <target
     name="clean"
     depends="init"
diff --git a/bin/mapgen.bat b/bin/mapgen.bat
deleted file mode 100644
index 3a7e8a64..00000000
--- a/bin/mapgen.bat
+++ /dev/null
@@ -1 +0,0 @@
-mapgenerator.exe ../data/message_template.msg ../libsecondlife-cs/mapgenerator/template.cs ../libsecondlife-cs/_Packets_.cs
\ No newline at end of file
diff --git a/libsecondlife-cs/_Packets_.cs b/libsecondlife-cs/_Packets_.cs
index b2a81c01..7c779c39 100644
--- a/libsecondlife-cs/_Packets_.cs
+++ b/libsecondlife-cs/_Packets_.cs
@@ -1477,8 +1477,6 @@ namespace libsecondlife.Packets
 
         public void ToXml(XmlWriter xmlWriter)
         {
-            //XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
-            //ns.Add("", "");
             XmlSerializer serializer = new XmlSerializer(typeof(Packet));
             serializer.Serialize(xmlWriter, this);
         }
diff --git a/libsecondlife-cs/examples/TestClient/TestClient.cs b/libsecondlife-cs/examples/TestClient/TestClient.cs
index d45f8da2..c773845a 100644
--- a/libsecondlife-cs/examples/TestClient/TestClient.cs
+++ b/libsecondlife-cs/examples/TestClient/TestClient.cs
@@ -4,6 +4,7 @@ using System.Reflection;
 using System.Xml;
 using libsecondlife;
 using libsecondlife.Packets;
+using libsecondlife.AssetSystem;
 
 namespace libsecondlife.TestClient
 {
@@ -86,9 +87,16 @@ namespace libsecondlife.TestClient
 
             client.Objects.RequestAllObjects = true;
 
-            client.Network.Login(account.FirstName, account.LastName, account.Password, 
+            bool login = client.Network.Login(account.FirstName, account.LastName, account.Password, 
                 "TestClient", "contact@libsecondlife.org");
-            
+
+            if (login)
+            {
+                // Set our appearance
+                AppearanceManager appearance = new AppearanceManager(client);
+                appearance.SendAgentSetAppearance();
+            }
+
             return client;
         }
 
diff --git a/libsecondlife-cs/examples/examples.build b/libsecondlife-cs/examples/examples.build
index 1be39667..d68a7379 100644
--- a/libsecondlife-cs/examples/examples.build
+++ b/libsecondlife-cs/examples/examples.build
@@ -57,7 +57,7 @@
     </csc>
   </target>
 
-  <target name="build" depends="init build-dll" description="Build all examples">
+  <target name="build" depends="init" description="Build all examples">
 	<foreach item="Folder" in="." property="example_path">
 	  <call target="example" unless="${string::contains(example_path,'svn') or string::contains(example_path,'IA_') or string::contains(example_path,'Test')}"/>
     </foreach>
@@ -69,11 +69,6 @@
     </foreach>
   </target>
 
-  <target name="build-dll" description="Builds libsecondlife dll">
-    <nant buildfile="../../libsecondlife.build"
-      target="${project.config} build-lib"/>
-  </target>
-
   <target name="clean-example" description="Deletes files for a given example">
     <property name="example_name" value="${path::get-file-name(example_path)}" />
     <delete failonerror="false">
diff --git a/libsecondlife.build b/libsecondlife.build
index a4798ed7..0a9f9f12 100644
--- a/libsecondlife.build
+++ b/libsecondlife.build
@@ -25,8 +25,6 @@
   <fileset id="apps">
     <include name="applications/TestBot/*.build" />
     <include name="applications/Decoder/*.build" />
-    <!-- <include name="applications/SecondSuite/*.build" /> -->
-    <!-- <include name="applications/SLChat/*.build" /> -->
     <include name="applications/SLIRC/*.build" />
     <include name="SLProxy/*.build" />
   </fileset>
diff --git a/mapgen.bat b/mapgen.bat
new file mode 100644
index 00000000..0cda963e
--- /dev/null
+++ b/mapgen.bat
@@ -0,0 +1 @@
+"bin/mapgenerator.exe" data/message_template.msg libsecondlife-cs/mapgenerator/template.cs libsecondlife-cs/_Packets_.cs
\ No newline at end of file