diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 1952b322aab6d16184e221ccb6a0198be2349bf6..56fe1b57a62b23afd50fee7f99d1a423745ef093 100755
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -3,7 +3,7 @@
  * Asterisk -- A telephony toolkit for Linux.
  *
  * Radio Repeater / Remote Base program 
- *  version 0.28 08/21/05
+ *  version 0.29 09/04/05
  * 
  * See http://www.zapatatelephony.org/app_rpt.html
  *
@@ -180,7 +180,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/say.h"
 #include "asterisk/localtime.h"
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.28  08/21/2005";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.29  09/04/2005";
 
 static char *app = "Rpt";
 
@@ -4797,13 +4797,13 @@ char cmd[MAXDTMF+1] = "";
 				/* if RX key */
 				if (f->subclass == AST_CONTROL_RADIO_KEY)
 				{
-					if (debug) printf("@@@@ rx key\n");
+					if (debug) printf("@@@@ rx key1 %s\n",myrpt->name);
 					myrpt->keyed = 1;
 				}
 				/* if RX un-key */
 				if (f->subclass == AST_CONTROL_RADIO_UNKEY)
 				{
-					if (debug) printf("@@@@ rx un-key\n");
+					if (debug) printf("@@@@ rx un-key1 %s\n",myrpt->name);
 					if(myrpt->keyed) {
 						rpt_telemetry(myrpt,UNKEY,NULL);
 					}
@@ -4963,13 +4963,13 @@ char cmd[MAXDTMF+1] = "";
 					/* if RX key */
 					if (f->subclass == AST_CONTROL_RADIO_KEY)
 					{
-						if (debug) printf("@@@@ rx key\n");
+						if (debug) printf("@@@@ rx key2, %s\n",l->name);
 						l->lastrx = 1;
 					}
 					/* if RX un-key */
 					if (f->subclass == AST_CONTROL_RADIO_UNKEY)
 					{
-						if (debug) printf("@@@@ rx un-key\n");
+						if (debug) printf("@@@@ rx un-key2, %s\n",l->name);
 						l->lastrx = 0;
 					}
 					if (f->subclass == AST_CONTROL_HANGUP)
@@ -5115,7 +5115,7 @@ pthread_attr_t attr;
 	/* start with blank config */
 	memset(&rpt_vars,0,sizeof(rpt_vars));
 
-	cfg = ast_load("rpt.conf");
+	cfg = ast_config_load("rpt.conf");
 	if (!cfg) {
 		ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf.  Radio Repeater disabled.\n");
 		pthread_exit(NULL);
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index aa212c2ef5f795b9a725e772004f8de20632b3e4..ad600ca3136c8ad482db40f1764c3c3f9c503ff5 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6937,7 +6937,8 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
 			(signalling == SIG_SF_FEATD) || (signalling == SIG_SF_FEATDMF) ||
 			  (signalling == SIG_SF_FEATB)) {
 			p.starttime = 250;
-		} else if (radio) {
+		}
+		if (radio) {
 			/* XXX Waiting to hear back from Jim if these should be adjustable XXX */
 			p.channo = channel;
 			p.rxwinktime = 1;