diff --git a/cross-configure.cool b/cross-configure.cool
index 60daab140..0a982071c 100755
--- a/cross-configure.cool
+++ b/cross-configure.cool
@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=nevis "$*"
 
diff --git a/cross-configure.cool.debug b/cross-configure.cool.debug
index 10f42ba3b..665ca44cb 100755
--- a/cross-configure.cool.debug
+++ b/cross-configure.cool.debug
@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=nevis "$*"
 
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/eitd/SIevents.cpp b/src/eitd/SIevents.cpp
index 78e60f5b6..f4849c03d 100644
--- a/src/eitd/SIevents.cpp
+++ b/src/eitd/SIevents.cpp
@@ -249,8 +249,12 @@ void SIevent::parseShortEventDescriptor(const uint8_t *buf, unsigned maxlen)
 
         int tsidonid = (transport_stream_id << 16) | original_network_id;
 
-        char lang[] = {tolower(evt->language_code_hi), tolower(evt->language_code_mid), tolower(evt->language_code_lo), '\0'};
-        std::string language(lang);
+	char lang[] = {'\0','\0','\0','\0'};
+	lang[0] = tolower(evt->language_code_hi);
+	lang[1] = tolower(evt->language_code_mid);
+	lang[2] = tolower(evt->language_code_lo);
+
+	std::string language(lang);
 	int table = getCountryCodeDefaultMapping(language);
 
         buf+=sizeof(struct descr_short_event_header);
@@ -272,7 +276,11 @@ void SIevent::parseExtendedEventDescriptor(const uint8_t *buf, unsigned maxlen)
 
         int tsidonid = (transport_stream_id << 16) | original_network_id;
 
-        char lang[] = {tolower(evt->iso_639_2_language_code_hi), tolower(evt->iso_639_2_language_code_mid), tolower(evt->iso_639_2_language_code_lo), '\0'};
+	char lang[] = {'\0','\0','\0','\0'};
+	lang[0] = tolower(evt->iso_639_2_language_code_hi);
+	lang[1] = tolower(evt->iso_639_2_language_code_mid);
+	lang[2] = tolower(evt->iso_639_2_language_code_lo);
+
         std::string language(lang);
 	int table = getCountryCodeDefaultMapping(language);
 
diff --git a/src/gui/update_ext.h b/src/gui/update_ext.h
index 2999c9fa2..d327fab24 100644
--- a/src/gui/update_ext.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 760c46546..a0eede79d 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3577,11 +3577,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/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index 9f1386050..917f1e003 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -1143,6 +1143,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());