diff --git a/Makefile.in b/Makefile.in
index 9a8a75003f..37841edfdd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ endif
 
 
 #####################################################################
-.PHONY: all server  \
+.PHONY: all server sql \
 	common \
 	mt19937ar \
 	login \
@@ -34,7 +34,7 @@ endif
 
 all: $(ALL_DEPENDS)
 
-sql:
+sql: $(SERVER_DEPENDS)
 	@echo "-!- 'make sql' is now deprecated. Please run 'make server' to continue. -!-"
 
 server: $(SERVER_DEPENDS)
diff --git a/src/map/unit.c b/src/map/unit.c
index 18ae5fef74..a7e7d3ca1b 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -188,7 +188,7 @@ int unit_teleport_timer(int tid, unsigned int tick, int id, intptr_t data)
 		TBL_PC *msd = unit_get_master(bl);
 		if(msd && !check_distance_bl(&msd->bl, bl, data)) {
 			*mast_tid = INVALID_TIMER;
-			unit_warp(bl, msd->bl.id, msd->bl.x, msd->bl.y, CLR_TELEPORT );
+			unit_warp(bl, msd->bl.m, msd->bl.x, msd->bl.y, CLR_TELEPORT );
 		}
 		else // No timer needed
 			*mast_tid = INVALID_TIMER;