diff --git a/OpenMetaverse.Tests/TypeTests.cs b/OpenMetaverse.Tests/TypeTests.cs
index a5cba558..37439427 100644
--- a/OpenMetaverse.Tests/TypeTests.cs
+++ b/OpenMetaverse.Tests/TypeTests.cs
@@ -71,7 +71,7 @@ namespace OpenMetaverse.Tests
             one = a.ToString();
             two = b.ToString();
             Assert.IsTrue(a == b);
-            Assert.IsTrue(a == zeroonetwo);
+            Assert.IsTrue(a == (UUID)zeroonetwo);
 
             // TODO: CRC test
         }
diff --git a/OpenMetaverse/AssetManager.cs b/OpenMetaverse/AssetManager.cs
index a65db997..25f072c4 100644
--- a/OpenMetaverse/AssetManager.cs
+++ b/OpenMetaverse/AssetManager.cs
@@ -177,6 +177,21 @@ namespace OpenMetaverse
         Baked = 1
     }
 
+    /// <summary>
+    /// Image file format
+    /// </summary>
+    public enum ImageCodec : byte
+    {
+        Invalid = 0,
+        RGB = 1,
+        J2C = 2,
+        BMP = 3,
+        TGA = 4,
+        JPEG = 5,
+        DXT = 6,
+        PNG = 7
+    }
+
     public enum TransferError : int
     {
         None = 0,
@@ -294,7 +309,7 @@ namespace OpenMetaverse
     public class ImageDownload : Transfer
     {
         public ushort PacketCount;
-        public int Codec;
+        public ImageCodec Codec;
         public bool NotFound;
         public Simulator Simulator;
         public SortedList<ushort, ushort> PacketsSeen;
@@ -1303,7 +1318,7 @@ namespace OpenMetaverse
                             catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, Client, e); }
                         }
 
-                        transfer.Codec = data.ImageID.Codec;
+                        transfer.Codec = (ImageCodec)data.ImageID.Codec;
                         transfer.PacketCount = data.ImageID.Packets;
                         transfer.Size = (int)data.ImageID.Size;
                         transfer.AssetData = new byte[transfer.Size];
diff --git a/OpenMetaverse/BlockingQueue.cs b/OpenMetaverse/BlockingQueue.cs
index 09bfd7be..520d3455 100644
--- a/OpenMetaverse/BlockingQueue.cs
+++ b/OpenMetaverse/BlockingQueue.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Threading;
 using OpenMetaverse;
 
-namespace System.Collections
+namespace OpenMetaverse
 {
     /// <summary>
     /// Same as Queue except Dequeue function blocks until there is an object to return.
diff --git a/OpenMetaverse/ObjectManager.cs b/OpenMetaverse/ObjectManager.cs
index 7b069951..13fba592 100644
--- a/OpenMetaverse/ObjectManager.cs
+++ b/OpenMetaverse/ObjectManager.cs
@@ -1693,8 +1693,8 @@ namespace OpenMetaverse
                     #endregion Decode update data
 
                     Primitive obj = (update.Avatar) ?
-                        (Primitive)GetAvatar(simulator, update.LocalID, null):
-                        (Primitive)GetPrimitive(simulator, update.LocalID, null);
+                        (Primitive)GetAvatar(simulator, update.LocalID, UUID.Zero):
+                        (Primitive)GetPrimitive(simulator, update.LocalID, UUID.Zero);
 
                     #region Update Client.Self
                     if (update.LocalID == Client.Self.localID)
diff --git a/OpenMetaverse/Types/UUID.cs b/OpenMetaverse/Types/UUID.cs
index f9abc73b..3ee2ef44 100644
--- a/OpenMetaverse/Types/UUID.cs
+++ b/OpenMetaverse/Types/UUID.cs
@@ -345,7 +345,7 @@ namespace OpenMetaverse
         /// <param name="val">A UUID in string form. Case insensitive, 
         /// hyphenated or non-hyphenated</param>
         /// <returns>A UUID built from the string representation</returns>
-        public static implicit operator UUID(string val)
+        public static explicit operator UUID(string val)
         {
             return new UUID(val);
         }