diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp
index 59ff3bbcc..ebb11c836 100644
--- a/lib/libdvbsub/dvbsub.cpp
+++ b/lib/libdvbsub/dvbsub.cpp
@@ -140,12 +140,16 @@ int dvbsub_getpid()
 
 void dvbsub_setpid(int pid)
 {
+	dvbsub_pid = pid;
+
+	if(dvbsub_pid == 0)
+		return;
+
 	clear_queue();
 
 	if(dvbSubtitleConverter)
 		dvbSubtitleConverter->Reset();
 
-	dvbsub_pid = pid;
 	pid_change_req = 1;
 	dvbsub_stopped = 0;
 
diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 28c7ccbc6..29a9f0448 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -1542,7 +1542,7 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
         void * uKva;
 
         uKva = cs_phys_addr(fbbuff);
-	printf("CFrameBuffer::blit2FB: data %x Kva %x\n", (int) fbbuff, (int) uKva);
+	//printf("CFrameBuffer::blit2FB: data %x Kva %x\n", (int) fbbuff, (int) uKva);
 
 	if(uKva != NULL) {
 		cmd = GXA_CMD_BLT | GXA_CMD_NOT_TEXT | GXA_SRC_BMP_SEL(1) | GXA_DST_BMP_SEL(2) | GXA_PARAM_COUNT(3);
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index d36c67b03..30eb0f554 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -917,7 +917,7 @@ printf("**************************** CChannelList::zapTo me %x %s tuned %d new %
 		if(g_settings.auto_timeshift && !CNeutrinoApp::getInstance()->recordingstatus) {
 			g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0);
 		}
-		g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
+		//g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
 
 		if (bouquetList != NULL) {
 			//bouquetList->adjustToChannel( getActiveChannelNumber());
@@ -927,13 +927,16 @@ printf("**************************** CChannelList::zapTo me %x %s tuned %d new %
 					TVbouquetList->adjustToChannelID(chan->channel_id);
 					TVsatList->adjustToChannelID(chan->channel_id);
 					TVfavList->adjustToChannelID(chan->channel_id);
+					TVallList->adjustToChannelID(chan->channel_id);
 				}
 				else if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio) {
 					RADIObouquetList->adjustToChannelID(chan->channel_id);
 					RADIOsatList->adjustToChannelID(chan->channel_id);
 					RADIOfavList->adjustToChannelID(chan->channel_id);
+					RADIOallList->adjustToChannelID(chan->channel_id);
 				}
 		}
+		g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
 	}
 }