diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp
index 16bba96fb..83a0c0532 100644
--- a/src/driver/pictureviewer/crw.cpp
+++ b/src/driver/pictureviewer/crw.cpp
@@ -120,7 +120,7 @@ void fh_crw_find_jpeg_thumbnail(FILE *fh)
 	fsize = ftell(fh);
 	fseek (fh, 0, SEEK_SET);
 
-	order=*((unsigned short*)header);
+	order = header[0] << 8 | header[1];
 
 	if (order == 0x4949)
 		hlength = header[2] + (header[3] << 8) + (header[4] << 16) + (header[5] << 24);
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 9af6ca696..b55cae84b 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -62,7 +62,6 @@ libneutrino_gui_a_SOURCES = \
 	epgplus.cpp \
 	epgview.cpp \
 	eventlist.cpp \
-	ext_update.cpp \
 	favorites.cpp \
 	filebrowser.cpp \
 	imageinfo.cpp \
@@ -102,6 +101,7 @@ libneutrino_gui_a_SOURCES = \
 	themes.cpp \
 	timeosd.cpp \
 	update.cpp \
+	update_ext.cpp \
 	update_menue.cpp \
 	update_settings.cpp \
 	user_menue.cpp \
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 3b95c477d..706822a7b 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -644,7 +644,7 @@ int CScanSetup::showUnicableSetup()
 	uni_setup->addIntroItems();
 
 	uni_setup->addItem(uniscr);
-	CMenuForwarder *mf = new CMenuForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
+	CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
 	uni_setup->addItem(mf);
 	res = uni_setup->exec(NULL, "");
 	delete uni_setup;
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 86a30055f..51ed5e007 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #include <gui/update.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/ext_update.cpp b/src/gui/update_ext.cpp
similarity index 99%
rename from src/gui/ext_update.cpp
rename to src/gui/update_ext.cpp
index 4c4ffe169..50619921f 100644
--- a/src/gui/ext_update.cpp
+++ b/src/gui/update_ext.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include <gui/update.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/ext_update.h b/src/gui/update_ext.h
similarity index 94%
rename from src/gui/ext_update.h
rename to src/gui/update_ext.h
index 2999c9fa2..d327fab24 100644
--- a/src/gui/ext_update.h
+++ b/src/gui/update_ext.h
@@ -98,14 +98,14 @@ static unsigned int timer_msec;
 #define DBG_TIMER_STOP(label)												\
 	gettimeofday(&timer_tv2, NULL);											\
 	timer_msec = ((timer_tv2.tv_sec - timer_tv.tv_sec) * 1000) + ((timer_tv2.tv_usec - timer_tv.tv_usec) / 1000);	\
-	printf("##### [ext_update.cpp] %s: %u msec\n", label, timer_msec);
+	printf("##### [%s] %s: %u msec\n", __FILE__, label, timer_msec);
 #else
 #define DBG_TIMER_START()
 #define DBG_TIMER_STOP(label)
 #endif // UPDATE_DEBUG_TIMER
 
 #ifdef UPDATE_DEBUG
-#define DBG_MSG(fmt, args...) printf("#### [ext_update.cpp:%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args);
+#define DBG_MSG(fmt, args...) printf("#### [%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__, __LINE__ , ## args);
 #else
 #define DBG_MSG(fmt, args...)
 #endif // UPDATE_DEBUG
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 05110dbdc..3ecf1133f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3741,11 +3741,11 @@ void CNeutrinoApp::loadKeys(const char * fname)
 
 	g_settings.key_list_start = tconfig.getInt32( "key_list_start", CRCInput::RC_nokey );
 	g_settings.key_list_end = tconfig.getInt32( "key_list_end", CRCInput::RC_nokey );
-	g_settings.key_timeshift = configfile.getInt32( "key_timeshift", CRCInput::RC_pause );
-	g_settings.key_plugin = configfile.getInt32( "key_plugin", CRCInput::RC_nokey );
-	g_settings.key_unlock = configfile.getInt32( "key_unlock", CRCInput::RC_setup );
-	g_settings.key_screenshot = configfile.getInt32( "key_screenshot", CRCInput::RC_nokey );
-	g_settings.key_current_transponder = configfile.getInt32( "key_current_transponder", CRCInput::RC_games );
+	g_settings.key_timeshift = tconfig.getInt32( "key_timeshift", CRCInput::RC_pause );
+	g_settings.key_plugin = tconfig.getInt32( "key_plugin", CRCInput::RC_nokey );
+	g_settings.key_unlock = tconfig.getInt32( "key_unlock", CRCInput::RC_setup );
+	g_settings.key_screenshot = tconfig.getInt32( "key_screenshot", CRCInput::RC_nokey );
+	g_settings.key_current_transponder = tconfig.getInt32( "key_current_transponder", CRCInput::RC_games );
 
 	g_settings.key_quickzap_up = tconfig.getInt32( "key_quickzap_up",  CRCInput::RC_up );
 	g_settings.key_quickzap_down = tconfig.getInt32( "key_quickzap_down",  CRCInput::RC_down );
diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index d75385ff9..56b29b6c6 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -37,7 +37,7 @@
 #include <zapit/debug.h>
 
 #include <system/helpers.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 bool file_exists(const char *filename)
 {
diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index 5e184e8eb..583ec2211 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -1145,6 +1145,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
 //------------------------------------------------------------
 void CTimerEvent_Record::fireEvent()
 {
+	Refresh();
 	CTimerd::RecordingInfo ri=eventInfo;
 	ri.eventID=eventID;
 	strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str());