diff --git a/scripts/conversation/missions/deliver.py b/scripts/conversation/missions/deliver.py
index 774e3e01..126665a7 100644
--- a/scripts/conversation/missions/deliver.py
+++ b/scripts/conversation/missions/deliver.py
@@ -43,7 +43,7 @@ def handlePickupStage(core, actor, npc, objective, mission):
 		endConversation(core, actor, npc)
 		return
 	
-	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p')
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'p')
 	objective.createDeliveryItem(core, actor)
 	objective.update(core, actor)
 	return
@@ -54,7 +54,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission):
 		endConversation(core, actor, npc)
 		return
 	
-	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r')
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'r')
 	core.objectService.destroyObject(objective.getDeliveryObject())
 	objective.update(core, actor)
 	return
@@ -65,6 +65,6 @@ def handleCompletionStage(core, actor, npc, objective, mission):
 		endConversation(core, actor, npc)
 		return
 	
-	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's')
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 's')
 	core.missionService.handleMissionComplete(actor, mission)
 	return
\ No newline at end of file
diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java
index 141c5397..47637f49 100644
--- a/src/resources/objects/building/BuildingObject.java
+++ b/src/resources/objects/building/BuildingObject.java
@@ -161,6 +161,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
 				PortalVisitor portal = ClientFileManager.loadFile(portalLayoutFilename, PortalVisitor.class);
 				
 				for (int i = 0; i <= portal.cellCount; i++) {
+					System.out.println("Cellname: " + portal.cells.get(i).name);
 					if (cellName.equals(portal.cells.get(i).name)) {
 						return getCellByCellNumber(i + 1);
 					}
diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java
index 60af71ec..809bcca8 100644
--- a/src/services/mission/MissionService.java
+++ b/src/services/mission/MissionService.java
@@ -383,6 +383,11 @@ public class MissionService implements INetworkDispatch {
 			return false;
 		}
 		
+		if (mission.getPlanetId() != creature.getPlanetId()) {
+			mission.setPlanet(creature.getPlanet());
+			mission.setPlanetId(creature.getPlanetId());
+		}
+		
 		missionBag.transferTo(creature, datapad, mission);
 		createMissionObjective(creature, mission);
 		return true;