diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 5a4394142f..6ad36cd8a2 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -31,11 +31,11 @@
 		if (moving_status == SHUTTLE_IDLE) 
 			return	//someone cancelled the launch
 		
-		move(locate(departing),locate(interim))
+		move(departing, interim)
 
 		sleep(travel_time*10)
 
-		move(locate(interim),locate(destination))
+		move(interim, destination)
 
 		moving_status = SHUTTLE_IDLE
 
@@ -69,7 +69,7 @@
 
 	//world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]."
 
-	//world << "area_coming_from: [area_coming_from]"
+	//world << "area_coming_from: [origin]"
 	//world << "destination: [destination]"
 
 	if(origin == destination)
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 3d878bcb60..1610a5deee 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -58,7 +58,7 @@
 		if (!at_station())	//at centcom
 			supply_controller.sell()
 
-/datum/shuttle/ferry/emergency/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
+/datum/shuttle/ferry/supply/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
 	short_jump(departing, destination)	//long jumps are disabled
 
 // returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index 4b737cd2cf..11974c7034 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -109,7 +109,7 @@
 		usr << "\red Ship stealth systems have been [(MS.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival."
 
 	if(href_list["move_multi"])
-		if((MS.last_move + MS.cooldown) > world.time)
+		if((MS.last_move + MS.cooldown*10) > world.time)
 			usr << "\red The ship's drive is inoperable while the engines are charging."
 			return
 
@@ -124,7 +124,7 @@
 			MS.at_origin = 0
 
 			
-			MS.long_jump(MS.last_departed,MS.destinations[choice],MS.interim,MS.move_time)
+			MS.long_jump(MS.last_departed, MS.destinations[choice], MS.interim, MS.move_time)
 			MS.last_departed = MS.destinations[choice]
 			return
 
@@ -132,7 +132,7 @@
 
 			MS.announce_departure()
 
-		MS.short_jump(locate(MS.last_departed),locate(MS.destinations[choice]))
+		MS.short_jump(MS.last_departed, MS.destinations[choice])
 		MS.last_departed = MS.destinations[choice]
 
 	updateUsrDialog()
\ No newline at end of file