diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b7b40f8e7b..9565a1ba59 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/08
+	* Removed the fixpos packet which is sent whenever you are hit while moving
+	  as Aegis doesn't sends this packet neither. [Skotlex]
 	* ES magic will now put the caster on stun for 0.5 secs regardless of
 	  whether the skill-target is a mob or not. [Skotlex]
 	* Added function clif_party_join_info which sends packet 0x1e9 each time a
diff --git a/src/map/skill.c b/src/map/skill.c
index 534b5f3051..67bad2ee14 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6243,8 +6243,9 @@ int skill_castend_map( struct map_session_data *sd,int skill_num, const char *ma
 					return 0;
 				}
 			}
-			
-			lv = sd->skillitem==skill_num?sd->menuskill_lv:pc_checkskill(sd,skill_num);
+		
+			//When it's an item-used warp-portal, the skill-lv used is lost.. assume max level.
+			lv = sd->skillitem==skill_num?skill_get_max(skill_num):pc_checkskill(sd,skill_num);
 			wx = sd->menuskill_lv>>16;
 			wy = sd->menuskill_lv&0xffff;
 			
diff --git a/src/map/unit.c b/src/map/unit.c
index bbb73ecdd2..01814b296c 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -676,9 +676,9 @@ int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int
 	{	//Stop walking, if chasing, readjust timers.
 		if (delay == 1)
 		{	//Minimal delay (walk-delay) disabled. Just stop walking.
-			unit_stop_walking(bl,1);
+			unit_stop_walking(bl,0);
 		} else {
-			unit_stop_walking(bl,3);
+			unit_stop_walking(bl,2);
 			if(ud->target)
 				add_timer(ud->canmove_tick+1, unit_walktobl_sub, bl->id, ud->target);
 		}