diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 96b9568c61..0bf2ce5d56 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1364,7 +1364,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
 		pim_upstream_start_register_stop_timer(up, 1);
 
 		if (((up->channel_oil->cc.lastused / 100)
-		     > PIM_KEEPALIVE_PERIOD)
+		     > pim->keep_alive_time)
 		    && (I_am_RP(pim_ifp->pim, up->sg.grp))) {
 			if (PIM_DEBUG_TRACE)
 				zlog_debug(
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 6eb413a4eb..7607bdf13b 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -257,8 +257,8 @@ int pim_interface_config_write(struct vty *vty)
 			if (vrf->vrf_id == VRF_DEFAULT)
 				vty_frame(vty, "interface %s\n", ifp->name);
 			else
-				vty_out(vty, "interface %s vrf %s\n", ifp->name,
-					vrf->name);
+				vty_frame(vty, "interface %s vrf %s\n",
+					  ifp->name, vrf->name);
 			++writes;
 
 			if (ifp->info) {
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index 3d104e7c7c..bf44f3c94a 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -139,7 +139,7 @@ int main(int argc, const char *argv[])
 	printf("%s: waiting...\n", prog_name);
 
 	if (getchar() == EOF)
-	  fprintf(stderr, "getchar failure\n");
+		fprintf(stderr, "getchar failure\n");
 
 	close(fd);