diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index c2089acc3e..14c43f8fac 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -3112,7 +3112,7 @@ static void dahdi_pri_update_span_devstate(struct sig_pri_span *pri)
 			if (pri->pvts[idx]->owner
 #if defined(HAVE_PRI_SERVICE_MESSAGES)
 				/* Out-of-service B channels are "in-use". */
-				&& pri->pvts[idx]->service_status
+				|| pri->pvts[idx]->service_status
 #endif	/* defined(HAVE_PRI_SERVICE_MESSAGES) */
 				) {
 				++in_use;
diff --git a/channels/sig_pri.h b/channels/sig_pri.h
index f57d8f700e..5a770ce0b0 100644
--- a/channels/sig_pri.h
+++ b/channels/sig_pri.h
@@ -295,8 +295,8 @@ struct sig_pri_span {
 	int fds[SIG_PRI_NUM_DCHANS];					/*!< FD's for d-channels */
 
 #if defined(HAVE_PRI_AOC_EVENTS)
-	int aoc_passthrough_flag;          /*!< Represents what AOC messages (S,D,E) are allowed to pass-through */
-	int aoce_delayhangup:1;            /*!< defines whether the aoce_delayhangup option is enabled or not */
+	int aoc_passthrough_flag;						/*!< Represents what AOC messages (S,D,E) are allowed to pass-through */
+	unsigned int aoce_delayhangup:1;				/*!< defines whether the aoce_delayhangup option is enabled or not */
 #endif	/* defined(HAVE_PRI_AOC_EVENTS) */
 
 #if defined(HAVE_PRI_SERVICE_MESSAGES)