diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b9f74eeab9..88d6819746 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
+2006/03/23
+	* Minor cleanups. [Lance]
+
 2006/03/22
 	* Fixed function pc_isCardAllowedOn causing searches for non-existant item
 	  id 0. [Skotlex]
diff --git a/src/map/script.c b/src/map/script.c
index 3226a6b2fb..70941e7eaa 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10244,7 +10244,7 @@ int buildin_setmobdata(struct script_state *st){
 				md->db->shield = (short)value;
 				break;
 			case 23:
-				md->ud.dir = (short)value;
+				md->ud.dir = (unsigned char)value;
 				break;
 			default:
 				ShowError("buildin_setmobdata: argument id is not identified.");
diff --git a/src/map/unit.c b/src/map/unit.c
index c38e7fa6f1..4280f9662f 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -366,7 +366,7 @@ int unit_movepos(struct block_list *bl,int dst_x,int dst_y, int easy, int checkp
 	return 1;
 }
 
-int unit_setdir(struct block_list *bl,unsigned short dir)
+int unit_setdir(struct block_list *bl,unsigned char dir)
 {
 	struct unit_data *ud;
 	nullpo_retr( 0, bl );
diff --git a/src/map/unit.h b/src/map/unit.h
index d711f19c88..9724a85231 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -27,7 +27,7 @@ int unit_walkdelay(struct block_list *bl, unsigned int tick, int adelay, int del
 // 位置の強制移動(吹き飛ばしなど)
 int unit_movepos(struct block_list *bl,int dst_x,int dst_y, int easy, int checkpath);
 int unit_warp(struct block_list *bl, int map, int x, int y, int type);
-int unit_setdir(struct block_list *bl,unsigned short dir);
+int unit_setdir(struct block_list *bl,unsigned char dir);
 int unit_getdir(struct block_list *bl);
 
 // そこまで歩行でたどり着けるかの判定
diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj
index bd809ae377..c5a9fe6caa 100644
--- a/vcproj-7.1/map-server_sql.vcproj
+++ b/vcproj-7.1/map-server_sql.vcproj
@@ -269,6 +269,9 @@
 			<File
 				RelativePath="..\src\map\trade.c">
 			</File>
+			<File
+				RelativePath="..\src\map\unit.c">
+			</File>
 			<File
 				RelativePath="..\src\zlib\unzip.c">
 			</File>
@@ -414,6 +417,9 @@
 			<File
 				RelativePath="..\src\map\trade.h">
 			</File>
+			<File
+				RelativePath="..\src\map\unit.h">
+			</File>
 			<File
 				RelativePath="..\src\common\utils.h">
 			</File>
diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj
index 7bd422c2a3..8e5e542355 100644
--- a/vcproj-7.1/map-server_txt.vcproj
+++ b/vcproj-7.1/map-server_txt.vcproj
@@ -270,6 +270,9 @@
 			<File
 				RelativePath="..\src\map\trade.c">
 			</File>
+			<File
+				RelativePath="..\src\map\unit.c">
+			</File>
 			<File
 				RelativePath="..\src\zlib\unzip.c">
 			</File>
@@ -415,6 +418,9 @@
 			<File
 				RelativePath="..\src\map\trade.h">
 			</File>
+			<File
+				RelativePath="..\src\map\unit.h">
+			</File>
 			<File
 				RelativePath="..\src\common\utils.h">
 			</File>