diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 91071a59c..8e1fd16d6 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2969,6 +2969,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 				standby.timer_minutes_hi    = fp_timer >> 8;;
 				standby.timer_minutes_lo    = fp_timer & 0xFF;
 
+				delete videoDecoder;
+				cs_api_exit();
+
 				int fd = open("/dev/display", O_RDONLY);
 				if (fd < 0) {
 					perror("/dev/display");
@@ -3057,7 +3060,7 @@ void CNeutrinoApp::saveEpg()
 		neutrino_msg_data_t data;
 		g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str());
 		while( true ) {
-			g_RCInput->getMsg(&msg, &data, 300); // 30 secs..
+			g_RCInput->getMsg(&msg, &data, 1200); // 120 secs..
 			if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) {
 				//printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED);
 				break;
@@ -3729,7 +3732,6 @@ void stop_daemons(bool stopall)
 			delete powerManager;
 		}
 		cs_deregister_messenger();
-		cs_api_exit();
 	}
 }
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index c2764aef5..c7eee7c5a 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2121,7 +2121,6 @@ void CZapit::run()
 	delete pcrDemux;
 	delete pmtDemux;
 	delete audioDecoder;
-	delete videoDecoder;
 	delete videoDemux;
 	delete audioDemux;