diff --git a/src/p_mobj.c b/src/p_mobj.c
index 8c80f1bcf..ce97024ba 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7311,7 +7311,7 @@ void P_MobjThinker(mobj_t *mobj)
 			case MT_FLAMEAURA_ORB:
 				if (!(mobj->flags2 & MF2_SHIELD))
 					return;
-				if (mobj->state-states < mobj->info->painstate)
+				if ((statenum_t)(mobj->state-states) < mobj->info->painstate)
 					mobj->angle = mobj->target->angle; // implicitly okay because of P_AddShield
 				if (mobj->tracer
 				/* && mobj->target -- the following is implicit by P_AddShield
diff --git a/src/p_user.c b/src/p_user.c
index 98f91768d..49ed8aa7f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8662,8 +8662,7 @@ static void P_DoRopeHang(player_t *player)
 
 	if (player->cmd.buttons & BT_USE && !(player->pflags & PF_STASIS)) // Drop off of the rope
 	{
-		player->pflags |= P_GetJumpFlags(player);
-		player->pflags |= PF_USEDOWN;
+		player->pflags |= (P_GetJumpFlags(player)|PF_USEDOWN);
 		P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
 
 		P_SetTarget(&player->mo->tracer, NULL);