diff --git a/Scripts/Engines/ConPVP/DuelContext.cs b/Scripts/Engines/ConPVP/DuelContext.cs
index d9bbbd16c..835036cfa 100644
--- a/Scripts/Engines/ConPVP/DuelContext.cs
+++ b/Scripts/Engines/ConPVP/DuelContext.cs
@@ -2581,7 +2581,19 @@ namespace Server.Engines.ConPVP
 
 		public static void CloseAndSendGump( NetState ns, Gump g, params Type[] types )
 		{
-			if ( ns == null )
+			if ( ns != null ) {
+				Mobile mob = ns.Mobile;
+
+				if ( mob != null ) {
+					foreach ( Type type in types ) {
+						mob.CloseGump( type );
+					}
+
+					mob.SendGump( g );
+				}
+			}
+
+			/*if ( ns == null )
 				return;
 
 			for ( int i = 0; i < types.Length; ++i )
@@ -2589,7 +2601,7 @@ namespace Server.Engines.ConPVP
 
 			g.SendTo( ns );
 
-			/*ns.AddGump( g );
+			ns.AddGump( g );
 
 			Packet[] packets = new Packet[types.Length + 1];
 
@@ -2604,7 +2616,7 @@ namespace Server.Engines.ConPVP
 			ns.CompressionEnabled = compress;*/
 		}
 
-		public static Packet BindPackets( bool compress, params Packet[] packets )
+		/*public static Packet BindPackets( bool compress, params Packet[] packets )
 		{
 			if ( packets.Length == 0 )
 				throw new ArgumentException( "No packets to bind", "packets" );
@@ -2632,6 +2644,6 @@ namespace Server.Engines.ConPVP
 				for ( int i = 0; i < compiled.Length; ++i )
 					m_Stream.Write( compiled[i], 0, lengths[i] );
 			}
-		}
+		}*/
 	}
 }
\ No newline at end of file
diff --git a/Scripts/Items/Skill Items/Misc/RepairDeed.cs b/Scripts/Items/Skill Items/Misc/RepairDeed.cs
index 7fce885f4..3a1f6e0a5 100644
--- a/Scripts/Items/Skill Items/Misc/RepairDeed.cs	
+++ b/Scripts/Items/Skill Items/Misc/RepairDeed.cs	
@@ -107,6 +107,16 @@ namespace Server.Items
 			//On OSI it says it's exceptional.  Intentional difference.
 		}
 
+		public override void OnSingleClick( Mobile from )
+		{
+			if ( Deleted || !from.CanSee( this ) )
+				return;
+
+			this.LabelTo( from, 1061133, String.Format( "{0}\t{1}", GetSkillTitle( m_SkillLevel ).ToString(), RepairSkillInfo.GetInfo( m_Skill ).Name ) ); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~.
+
+			if( m_Crafter != null )
+				this.LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
+		}
 
 		[Constructable]
 		public RepairDeed() : this( RepairSkillType.Smithing, 100.0, null, true )
diff --git a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs
index a29fb539e..c0c1c2e5e 100644
--- a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs
+++ b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs
@@ -16,7 +16,7 @@ namespace Server.Mobiles
 		[Constructable]
 		public Nightmare( string name ) : base( name, 0x74, 0x3EA7, AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 )
 		{
-			BaseSoundID = 0xA8;
+			BaseSoundID = Core.AOS ? 0xA8 : 0x16A;
 
 			SetStr( 496, 525 );
 			SetDex( 86, 105 );
@@ -116,8 +116,10 @@ namespace Server.Mobiles
 
 			int version = reader.ReadInt();
 
-			if ( BaseSoundID == 0x16A )
+			if ( Core.AOS && BaseSoundID == 0x16A )
 				BaseSoundID = 0xA8;
+			else if ( !Core.AOS && BaseSoundID == 0xA8 )
+				BaseSoundID = 0x16A;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs
index 480f83bb7..6f3623e2b 100644
--- a/Scripts/Mobiles/PlayerMobile.cs
+++ b/Scripts/Mobiles/PlayerMobile.cs
@@ -515,18 +515,21 @@ namespace Server.Mobiles
 			if ( !base.OnDroppedItemToWorld( item, location ) )
 				return false;
 
-			IPooledEnumerable mobiles = Map.GetMobilesInRange( location, 0 );
-
-			foreach ( Mobile m in mobiles )
+			if ( Core.AOS )
 			{
-				if ( m.Z >= location.Z && m.Z < location.Z + 16 )
-				{
-					mobiles.Free();
-					return false;
-				}
-			}
+				IPooledEnumerable mobiles = Map.GetMobilesInRange( location, 0 );
 
-			mobiles.Free();
+				foreach ( Mobile m in mobiles )
+				{
+					if ( m.Z >= location.Z && m.Z < location.Z + 16 )
+					{
+						mobiles.Free();
+						return false;
+					}
+				}
+
+				mobiles.Free();
+			}
 
 			BounceInfo bi = item.GetBounce();
 
@@ -2171,7 +2174,7 @@ namespace Server.Mobiles
 
 			DropHolding();
 
-			if (Backpack != null && !Backpack.Deleted)
+			if (Core.AOS && Backpack != null && !Backpack.Deleted)
 			{
 				List<Item> ilist = Backpack.FindItemsByType<Item>(FindItems_Callback);