diff --git a/src/target/etb.c b/src/target/etb.c
index b96ffe318..d9b067476 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -448,7 +448,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
 		arm7_9->etm_ctx->capture_driver_priv = etb;
 
 		etb->tap  = tap;
-		etb->cur_scan_chain = ~0UL;
+		etb->cur_scan_chain = 0xffffffff;
 		etb->reg_cache = NULL;
 		etb->ram_width = 0;
 		etb->ram_depth = 0;
diff --git a/src/target/etm.c b/src/target/etm.c
index 41897ec00..c60cc0d7b 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -992,9 +992,9 @@ static int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd
 		if ((pipestat == STAT_IE) || (pipestat == STAT_ID))
 		{
 			if (((instruction.type == ARM_B) ||
-				(instruction.type == ARM_BL) ||
-				(instruction.type == ARM_BLX)) &&
-				(instruction.info.b_bl_bx_blx.target_address != ~0UL))
+			     (instruction.type == ARM_BL) ||
+			     (instruction.type == ARM_BLX)) &&	 
+			    (instruction.info.b_bl_bx_blx.target_address != 0xffffffff))
 			{
 				next_pc = instruction.info.b_bl_bx_blx.target_address;
 			}
diff --git a/src/target/xscale.c b/src/target/xscale.c
index c3b8d3358..dec1ede90 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -2933,7 +2933,7 @@ int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx)
 						(((instruction.type == ARM_B) ||
 							(instruction.type == ARM_BL) ||
 							(instruction.type == ARM_BLX)) &&
-							(instruction.info.b_bl_bx_blx.target_address != ~0UL)))
+							(instruction.info.b_bl_bx_blx.target_address != 0xffffffff)))
 					{
 						xscale->trace.current_pc = instruction.info.b_bl_bx_blx.target_address;
 					}