diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c
index 7e566367fb..cd580d30a1 100644
--- a/src/mod/applications/mod_conference/conference_api.c
+++ b/src/mod/applications/mod_conference/conference_api.c
@@ -1977,7 +1977,7 @@ switch_status_t conference_api_sub_write_png(conference_obj_t *conference, switc
 
 	if (conference->canvas_count > 1) {
 		/* pick super canvas */
-		canvas = conference->canvases[conference->canvas_count];
+		canvas = conference->canvases[conference->canvas_count-1];
 	} else {
 		canvas = conference->canvases[0];
 	}
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 1443f989cf..429e038da7 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -3610,6 +3610,7 @@ SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint3
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setting delay to %dms (%d frames)\n", delay_ms, qlen);
 
 	switch_jb_create(&jb, SJB_AUDIO, qlen, qlen, switch_core_session_get_pool(session));
+	switch_jb_set_session(jb, session);
 
 	if ((var = switch_channel_get_variable(channel, "delay_echo_debug_level"))) {
 		debug = atoi(var);
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 46e13253b7..0ae730c699 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -8583,6 +8583,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 				}
 
 				switch_jb_create(&rtp_session->vbw, SJB_VIDEO, nack_size, nack_size, rtp_session->pool);
+				switch_jb_set_session(rtp_session->vbw, rtp_session->session);
 
 				if (rtp_session->vbw) {
 					switch_jb_set_flag(rtp_session->vbw, SJB_QUEUE_ONLY);