diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index 19f042bc2e..3ef8db53d1 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -493,7 +493,7 @@ static void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/*now go to the RING state */
 			ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
 			
-		} else if (i > g_ftdm_sngss7_data.min_digits) {
+		} else if (i >= g_ftdm_sngss7_data.min_digits) {
 			SS7_DEBUG_CHAN(ftdmchan, "Received %d digits (min digits = %d)\n", i, g_ftdm_sngss7_data.min_digits);
 
 			/*now go to the RING state */
@@ -511,7 +511,7 @@ static void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 									sngss7_info->t35.beat,
 									sngss7_info->t35.callback,
 									&sngss7_info->t35,
-									&sngss7_info->t35.heartbeat_timer)) {
+									&sngss7_info->t35.hb_timer_id)) {
 
 				SS7_ERROR ("Unable to schedule timer, hanging up call!\n");
 
@@ -536,8 +536,8 @@ static void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		}
 
 		/* kill t35 if active */
-		if (sngss7_info->t35.heartbeat_timer) {
-			ftdm_sched_cancel_timer (sngss7_info->t35.sched,&sngss7_info->t35.heartbeat_timer);
+		if (sngss7_info->t35.hb_timer_id) {
+			ftdm_sched_cancel_timer (sngss7_info->t35.sched, sngss7_info->t35.hb_timer_id);
 		}
 
 		SS7_DEBUG_CHAN(ftdmchan, "Sending incoming call from %s to %s to FTDM core\n",
@@ -816,8 +816,8 @@ static void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 		} /* if ((ftdmchan->last_state == FTDM_CHANNEL_STATE_RESTART) */
 
 		/* check if t35 is active */
-		if (sngss7_info->t35.heartbeat_timer) {
-			ftdm_sched_cancel_timer (sngss7_info->t35.sched, &sngss7_info->t35.heartbeat_timer);
+		if (sngss7_info->t35.hb_timer_id) {
+			ftdm_sched_cancel_timer (sngss7_info->t35.sched, sngss7_info->t35.hb_timer_id);
 		}
 
 		/* clear all of the call specific data store in the channel structure */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 415a897181..850bbf0d1a 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -316,7 +316,7 @@ typedef struct ftdm_sngss7_data {
 }ftdm_sngss7_data_t;
 
 typedef struct sngss7_timer_data {
-	ftdm_timer_t			*heartbeat_timer;
+	ftdm_timer_id_t			hb_timer_id;
 	int						beat;
 	int						counter;
 	ftdm_sched_callback_t	callback;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
index 5185ffcc62..75b32d6892 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c
@@ -64,7 +64,7 @@ void handle_isup_t35(void *userdata)
     sngss7_set_flag(sngss7_info, FLAG_LOCAL_REL);
 
     /* hang up on timer expiry */
-    ftdmchan->caller_data.hangup_cause = 102;
+    ftdmchan->caller_data.hangup_cause = 28;
 
     /* end the call */
     ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);