diff --git a/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs b/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs
index 2250dd902..7fc8c1c37 100644
--- a/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs	
+++ b/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs	
@@ -94,8 +94,8 @@ namespace Server.Items
 
 			if ( IsChildOf( from ) )
 			{
-				list.Add(new NinjaWeapon.LoadEntry(this));
-				list.Add(new NinjaWeapon.UnloadEntry(this));
+				list.Add(new NinjaWeapon.LoadEntry(this, 6224));
+				list.Add(new NinjaWeapon.UnloadEntry(this, 6225));
 			}
 		}
 
diff --git a/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs b/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
index 71e56766f..19d963c6d 100644
--- a/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs	
+++ b/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs	
@@ -107,8 +107,8 @@ namespace Server.Items
 
 			if ( IsChildOf( from ) )
 			{
-				list.Add( new NinjaWeapon.LoadEntry( this ) );
-				list.Add( new NinjaWeapon.UnloadEntry( this ) );
+				list.Add(new NinjaWeapon.LoadEntry(this, 6222));
+				list.Add(new NinjaWeapon.UnloadEntry(this, 6222));
 			}
 		}
 
diff --git a/Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs b/Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
index 65425a72b..e1673af0b 100644
--- a/Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs	
+++ b/Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs	
@@ -346,8 +346,8 @@ namespace Server.Items
 		{
 			private INinjaWeapon weapon;
 
-			public LoadEntry(INinjaWeapon wep)
-				: base(6222, 0)
+			public LoadEntry(INinjaWeapon wep, int entry)
+				: base(entry, 0)
 			{
 				weapon = wep;
 			}
@@ -365,10 +365,10 @@ namespace Server.Items
 		{
 			private INinjaWeapon weapon;
 
-			public UnloadEntry(INinjaWeapon belt)
-				: base(6223, 0)
+			public UnloadEntry(INinjaWeapon wep, int entry)
+				: base(entry, 0)
 			{
-				weapon = belt;
+				weapon = wep;
 
 				Enabled = (weapon.UsesRemaining > 0);
 			}
diff --git a/Scripts/Spells/Base/SpellHelper.cs b/Scripts/Spells/Base/SpellHelper.cs
index 832505ff7..1f292a9be 100644
--- a/Scripts/Spells/Base/SpellHelper.cs
+++ b/Scripts/Spells/Base/SpellHelper.cs
@@ -75,10 +75,12 @@ namespace Server.Spells
 		{
 			return CheckMulti( p, map, true, 0);
 		}
+		
 		public static bool CheckMulti(Point3D p, Map map, bool houses)
 		{
 			return CheckMulti(p, map, houses, 0);
 		}
+		
 		public static bool CheckMulti( Point3D p, Map map, bool houses, int housingrange )
 		{
 			if( map == null || map == Map.Internal )
@@ -90,11 +92,11 @@ namespace Server.Spells
 			{
 				BaseMulti multi = sector.Multis[i];
 
-				if( houses && multi is BaseHouse  )
+				if( multi is BaseHouse )
 				{
 					BaseHouse bh = (BaseHouse)multi;
 
-					if(bh.IsInside( p, 16 ) || (housingrange > 0 && bh.InRange(p, housingrange)))
+					if( ( houses && bh.IsInside( p, 16 ) ) || ( housingrange > 0 && bh.InRange( p, housingrange ) ) )
 						return true;
 				}
 				else if( multi.Contains( p ))
@@ -102,6 +104,7 @@ namespace Server.Spells
 					return true;
 				}
 			}
+			
 			return false;
 		}
 
diff --git a/Scripts/Spells/Ninjitsu/ShadowJump.cs b/Scripts/Spells/Ninjitsu/ShadowJump.cs
index 2002b6c2e..5ebdc8e64 100644
--- a/Scripts/Spells/Ninjitsu/ShadowJump.cs
+++ b/Scripts/Spells/Ninjitsu/ShadowJump.cs
@@ -77,7 +77,7 @@ namespace Server.Spells.Ninjitsu
 			{
 				Caster.SendLocalizedMessage( 502831 ); // Cannot teleport to that spot.
 			}
-			else if (SpellHelper.CheckMulti( Caster.Location, Caster.Map, true, 5 ))
+			else if ( SpellHelper.CheckMulti( new Point3D( p ), map, true, 5 ) )
 			{
 				Caster.SendLocalizedMessage( 502831 ); // Cannot teleport to that spot.
 			}