diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp
index 2e254f7af..e36df5b2d 100644
--- a/lib/libtuxtxt/tuxtxt.cpp
+++ b/lib/libtuxtxt/tuxtxt.cpp
@@ -1934,8 +1934,6 @@ int Init(int source)
 	TTFShiftX         = 0;
 	TTFShiftY         = -2;
 
-	pageinfo = NULL;
-
 	/* load config */
 	if ((conf = fopen(TUXTXTCONF, "rt")) == 0)
 	{
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 6794358b3..dfd70d8bf 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -247,7 +247,6 @@ void streamts_main_thread(void * /*data*/)
 	if(st != 0) {
 		printf("Stopping stream thread\n");
 		exit_flag = 1;
-		pthread_cancel(st);
 		pthread_join(st, NULL);
 		close(connfd);
 	}
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e13e241fd..98b05a173 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3741,7 +3741,6 @@ void sighandler (int signum)
           case SIGINT:
 		delete CRecordManager::getInstance();
 		stop_daemons();
-		delete CFrameBuffer::getInstance();
                 _exit(0);
           default:
                 break;
diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp
index c4ed5693b..efca3dbf9 100644
--- a/src/sectionsd/sectionsd.cpp
+++ b/src/sectionsd/sectionsd.cpp
@@ -2318,14 +2318,10 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
 
 	if (scanning && pause)
 	{
-		scanning = 0;
 		dmxCN.request_pause();
-		pthread_cond_broadcast(&dmxCN.change_cond);
 		dmxEIT.request_pause();
-		pthread_cond_broadcast(&dmxEIT.change_cond);
 #ifdef ENABLE_FREESATEPG
 		dmxFSEIT.request_pause();
-		pthread_cond_broadcast(&dmxFSEIT.change_cond);
 #endif
 #ifdef UPDATE_NETWORKS
 		dmxNIT.request_pause();
@@ -2334,6 +2330,7 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
 #ifdef ENABLE_PPT
 		dmxPPT.request_pause();
 #endif
+		scanning = 0;
 	}
 	else if (!pause && !scanning)
 	{
diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp
index 2af969c2f..588249d55 100644
--- a/src/zapit/lib/zapitclient.cpp
+++ b/src/zapit/lib/zapitclient.cpp
@@ -921,8 +921,10 @@ void CZapitClient::setStandby(const bool enable)
 	CZapitMessages::commandBoolean msg;
 	msg.truefalse = enable;
 	send(CZapitMessages::CMD_SET_STANDBY, (char*)&msg, sizeof(msg));
-	CZapitMessages::responseCmd response;
-	CBasicClient::receive_data((char* )&response, sizeof(response));
+	if(enable) {
+		CZapitMessages::responseCmd response;
+		CBasicClient::receive_data((char* )&response, sizeof(response));
+	}
 	close_connection();
 }
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index da501aafe..c2764aef5 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -1520,10 +1520,10 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
 		if (msgBoolean.truefalse) {
 			// if(currentMode & RECORD_MODE) videoDecoder->freeze();
 			enterStandby();
+			response.cmd = CZapitMessages::CMD_READY;
+			CBasicServer::send_data(connfd, &response, sizeof(response));
 		} else
 			leaveStandby();
-		response.cmd = CZapitMessages::CMD_READY;
-		CBasicServer::send_data(connfd, &response, sizeof(response));
 		break;
 	}