diff --git a/configure.ac b/configure.ac
index 08c5c4d6f..f2a63b926 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ if test "$BOXTYPE" = "coolstream"; then
 fi
 
 if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "generic" ||
    test "$BOXTYPE" = "tripledragon" ||
    test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots])
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 8dedd91de..2d4fe8c29 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2504,7 +2504,7 @@ servicemenu.imageinfo Image info
 servicemenu.reload Reload channel lists
 servicemenu.reload_hint Reloading channel lists,\nplease be patient.
 servicemenu.restart Soft restart
-servicemenu.restart_hint Neutrino will be restarted
+servicemenu.restart_hint Restarting, please wait ...
 servicemenu.restart_refused_recording Cant restart, recording in progress
 servicemenu.restart_tuner Restart tuner
 servicemenu.restarting_tuner Restarting tuner
diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index c1152e4ca..176354c04 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -258,8 +258,8 @@ void CRCInput::open(bool recheck)
 	//+++++++++++++++++++++++++++++++++++++++
 #ifdef KEYBOARD_INSTEAD_OF_REMOTE_CONTROL
 	fd_keyb = STDIN_FILENO;
-	if (fd_rc[0] < 0)
-		fd_rc[0] = fd_keyb;
+	if (indev[0].fd < 0)
+		indev[0].fd = fd_keyb;
 #else
 	fd_keyb = 0;
 #endif /* KEYBOARD_INSTEAD_OF_REMOTE_CONTROL */
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 71b37ac58..9a9a8a682 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -267,8 +267,11 @@ bool CStreamManager::Stop()
 	if (!running)
 		return false;
 	running = false;
-	cancel();
-	bool ret = (OpenThreads::Thread::join() == 0);
+	bool ret = false;
+	if (OpenThreads::Thread::CurrentThread() == this) {
+		cancel();
+		ret = (OpenThreads::Thread::join() == 0);
+	}
 	StopAll();
 	return ret;
 }
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 4d0f39b5e..514844438 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -1418,11 +1418,12 @@ bool CTimeThread::setSystemTime(time_t tim, bool force)
 
 	tv.tv_sec = tim;
 	tv.tv_usec = 0;
+	errno=0;
 	if (settimeofday(&tv, NULL) == 0)
 		return true;
 
 	perror("[sectionsd] settimeofday");
-	return false;
+	return errno==EPERM;
 }
 
 void CTimeThread::addFilters()
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 3543bbfb6..f45487d23 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -660,7 +660,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 	*/
 	audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
 
-	if (type == AUDIO_FMT_MPEG)
+	if (type == AUDIO_FMT_MPEG || type == AUDIO_FMT_MP3)
 	{
 		const char *mpegmodes[] =
 		{
@@ -670,7 +670,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 			"single_ch"
 		};
 		int max_mode = sizeof(mpegmodes) / sizeof(mpegmodes[0]);
-		snprintf(buf, sizeof(buf), "MPEG %s (%d)",
+		snprintf(buf, sizeof(buf), "%s %s (%d)",type == AUDIO_FMT_MPEG ? "MPEG":"MP3",
 			 (mode > max_mode) ? "unk" : mpegmodes[mode],
 			 freq);
 	}
diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp
index 1c5049e6a..9f483bd8c 100644
--- a/src/gui/widget/buttons.cpp
+++ b/src/gui/widget/buttons.cpp
@@ -29,7 +29,7 @@
 
 #include <gui/widget/buttons.h>
 #include <system/settings.h>
-#include <driver/stacktrace.h>
+#include <system/stacktrace.h>
 #include <driver/fontrenderer.h>
 
 
diff --git a/src/system/stacktrace.cpp b/src/system/stacktrace.cpp
index d692287f1..1c6bcd449 100644
--- a/src/system/stacktrace.cpp
+++ b/src/system/stacktrace.cpp
@@ -176,5 +176,14 @@ void install_crash_handler()
 	void *trace[16];
 	backtrace(trace, 16);
 }
+#else
+void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
+{
+	(void) out;
+	(void) max_frames;
+}
 
+void install_crash_handler()
+{
+}
 #endif
diff --git a/src/uncooloff.c b/src/uncooloff.c
index 2c48e8cd0..8441cf1bd 100644
--- a/src/uncooloff.c
+++ b/src/uncooloff.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index cc0acf8c1..eb4875aad 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -1880,6 +1880,7 @@ void CFrontend::sendDiseqcStandby(uint32_t ms)
 		fop(ioctl, FE_SET_VOLTAGE, SEC_VOLTAGE_13);
 		return;
 	}
+	/* en50494 switches don't seem to be hurt by this */
 	// Send power off to 'all' equipment
 	sendDiseqcZeroByteCommand(0xe0, 0x00, 0x02, ms);
 }