diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index c2ad9bb95..a130c0b38 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.6:
+- Fixes to logic in the Utwig conversations (Bugs 327, 647), from Nic 
+  and Michael
 - Removed unused and invalid lander font chars - Alex
 - Setup menu reads strings out of lbm/setupmenu.txt - Michael
 - More fixes towards working 64-bits binaries.
diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c
index d2cc7c740..2c66ba828 100644
--- a/sc2/src/sc2code/comm/utwig/utwigc.c
+++ b/sc2/src/sc2code/comm/utwig/utwigc.c
@@ -519,6 +519,7 @@ NeutralUtwig (RESPONSE_REF R)
 		NPCPhrase (ABOUT_US_2);
 
 		LastStack = 2;
+		ActivateStarShip (SUPOX_SHIP, SPHERE_TRACKING);
 		SET_GAME_STATE (UTWIG_WAR_NEWS, 2);
 	}
 	else if (PLAYER_SAID (R, what_about_you_3))
@@ -712,12 +713,22 @@ BombWorld (RESPONSE_REF R)
 	LastStack ^= 1;
 	if (pStr[LastStack])
 		Response (pStr[LastStack], BombWorld);
-	if (PHRASE_ENABLED (whats_up_bomb))
+
+	if (PHRASE_ENABLED (whats_up_bomb) && (GET_GAME_STATE (BOMB_STACK1) > 1))
 		Response (whats_up_bomb, BombWorld);
+
 	if (GET_GAME_STATE (ULTRON_CONDITION)
 			&& !GET_GAME_STATE (REFUSED_ULTRON_AT_BOMB))
 		Response (got_ultron, ExitConversation);
-	Response (bye_bomb, ExitConversation);
+
+	if (GET_GAME_STATE (BOMB_INFO))
+	{
+		Response (bye_bomb, ExitConversation);
+	}
+	else
+	{
+		Response (bye_neutral, ExitConversation);
+	}
 }
 
 static void