diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6178b71975..147b9c1753 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,12 +4,7 @@ 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/04/01
-	* Fixed standing up no really making you stand up. [Skotlex]
-	* Added upgrade_svn5834.sql to update view for item type 10. Because of the
-	  ammo upgrade, all arrows need their view set to 1. This query does that to
-	  all type 10 items (this includes all ninja weapons as well, but a proper
-	  item_db.sql update is pending until the rest of throwables are updated)
-	  [Skotlex]
+	* Fixed compiler warnings. [Lance]
 	* Added structure view_data to handle sprite information for all characters
 	  (equipment, weapons, hair, dyes, etc). [Skotlex]
 	* Rewrote several clif functions to adapt to the new view_data class.
diff --git a/src/map/clif.c b/src/map/clif.c
index 43a8ebb0dc..8705b30bfa 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -813,7 +813,7 @@ void clif_get_weapon_view(TBL_PC* sd, short *rhand, short *lhand)
 #endif
 }	
 
-static void clif_get_guild_data(struct block_list *bl, long *guild_id, long *emblem_id) 
+static void clif_get_guild_data(struct block_list *bl, long *guild_id, short *emblem_id) 
 {
 	//TODO: There has to be a way to clean this up.
 	switch (bl->type) {
@@ -848,7 +848,8 @@ static void clif_get_guild_data(struct block_list *bl, long *guild_id, long *emb
 static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned char *buf) {
 	struct status_change *sc;
 	struct map_session_data *sd;
-	long guild_id=0, emblem_id=0, lv;
+	long guild_id=0;
+	unsigned short emblem_id=0, lv;
 	unsigned short dir;
 
 	nullpo_retr(0, bl);
@@ -969,7 +970,8 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit_data *ud, unsigned char *buf) {
 	struct status_change *sc;
 	struct map_session_data *sd;
-	long guild_id=0, emblem_id=0, lv;
+	long guild_id=0;
+	unsigned short emblem_id=0, lv;
 
 	nullpo_retr(0, bl);
 	BL_CAST(BL_PC, bl, sd);
diff --git a/src/map/irc.c b/src/map/irc.c
index f1f6b0e0a1..fc375ff2da 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -199,8 +199,6 @@ void irc_send(char *buf)
 
 void irc_parse_sub(int fd, char *incoming_string)
 {
-	int i=0;
-	int authed=0;
 	char kami[256]; //[Zido]
 	char source[256];
 	char command[256];
diff --git a/src/map/pet.c b/src/map/pet.c
index 4aef4e9b4a..db3ee4928a 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -973,7 +973,7 @@ static int pet_ai_sub_hard(struct pet_data *pd,unsigned int tick)
 
 	//Return speed to normal.
 	if (pd->speed != sd->petDB->speed)
-		pd->speed == sd->petDB->speed;
+		pd->speed = sd->petDB->speed;
 	
 	if (pd->target_id) {
 		target= map_id2bl(pd->target_id);
diff --git a/src/map/script.c b/src/map/script.c
index c9dfb3cd8a..d603995d76 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8155,7 +8155,6 @@ int soundeffect_sub(struct block_list* bl,va_list ap)
 int buildin_soundeffectall(struct script_state *st)
 {
 	// [Lance] - Improved.
-	struct map_session_data *sd=NULL;
 	char *name, *map = NULL;
 	struct block_list *bl;
 	int type, coverage, x0, y0, x1, y1;