diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 94809af790..9c58f5a143 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -614,8 +614,8 @@ static struct zt_pvt {
 	unsigned int firstradio:1;
 	unsigned int hanguponpolarityswitch:1;
 	unsigned int hardwaredtmf:1;
-	unsigned int hidecallerid;
-	unsigned int hidecalleridname;      /*!< Hide just the name not the number for legacy PBX use */
+	unsigned int hidecallerid:1;
+	unsigned int hidecalleridname:1;      /*!< Hide just the name not the number for legacy PBX use */
 	unsigned int ignoredtmf:1;
 	unsigned int immediate:1;			/*!< Answer before getting digits? */
 	unsigned int inalarm:1;
@@ -8349,7 +8349,7 @@ static void ss7_reset_linkset(struct zt_ss7 *linkset)
 	int i, startcic = -1, endcic;
 
 	if (linkset->numchans <= 0)
-		return 0;
+		return;
 
 	startcic = linkset->pvts[0]->cic;