diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index e91a25b7f..2cedd826e 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -2411,7 +2411,6 @@ bool CZapProtection::check()
 	hint = NONEXISTANT_LOCALE;
 	int res;
 	std::string cPIN;
-	char systemstr[128];
 	do
 	{
 		cPIN = "";
@@ -2421,9 +2420,6 @@ bool CZapProtection::check()
 		res = PINInput->exec(getParent(), "");
 		delete PINInput;
 		cPIN[4] = 0;
-		strcpy(systemstr, CONFIGDIR "/pinentered.sh ");
-		strcat(systemstr, cPIN.c_str());
-		system(systemstr);
 
 		hint = LOCALE_PINPROTECTION_WRONGCODE;
 	} while ( (cPIN != *validPIN) && !cPIN.empty() &&
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index bf618f3b8..bade2d97e 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2280,8 +2280,13 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
 #if ! HAVE_AZBOX_HARDWARE
 	/* start video */
 	if (video_pid) {
+	#if HAVE_COOL_HARDWARE
+		videoDecoder->Start(0, pcr_pid, video_pid);
+		videoDemux->Start();
+	#else
 		videoDemux->Start();
 		videoDecoder->Start(0, pcr_pid, video_pid);
+	#endif
 	}
 #endif
 #ifdef USE_VBI