diff --git a/src/c_console.cpp b/src/c_console.cpp
index f3b91efde..0e9b94996 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -1577,7 +1577,7 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
 				static TArray<char> command;
 				const size_t length = buffer.Text.Len();
 
-				command.Resize(length + 1);
+				command.Resize(unsigned(length + 1));
 				memcpy(&command[0], buffer.Text.GetChars(), length);
 				command[length] = '\0';
 
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 9aa178e64..102142d38 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1545,7 +1545,7 @@ dopain:
 				target->SetState (target->SeeState);
 			}
 		}
-		else if (source != target->target && target->OkayToSwitchTarget (source))
+		else if ((damage > 0 || fakedPain) && source != target->target && target->OkayToSwitchTarget (source))
 		{
 			// Target actor is not intent on another actor,
 			// so make him chase after source