diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp
index 7081e5ca0..50df32b64 100644
--- a/lib/libdvbsub/dvbsub.cpp
+++ b/lib/libdvbsub/dvbsub.cpp
@@ -50,7 +50,7 @@ static void clear_queue();
 int dvbsub_init() {
 	int trc;
 
-	sub_debug.set_level(3);
+	sub_debug.set_level(2);
 
 	reader_running = true;
 	dvbsub_stopped = 1;
@@ -244,7 +244,11 @@ static void* reader_thread(void * /*arg*/)
 	set_threadname("dvbsub:reader");
 
         dmx = new cDemux(0);
+#if HAVE_TRIPLEDRAGON
+	dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024);
+#else
         dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
+#endif
 
 	while (reader_running) {
 		if(dvbsub_stopped /*dvbsub_paused*/) {
diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index 897f9fc49..2b9d2c521 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 // Set these to 'true' for debug output:
-static bool DebugConverter = true;
+static bool DebugConverter = false;
 
 #define dbgconverter(a...) if (DebugConverter) sub_debug.print(Debug::VERBOSE, a)
 
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 30c68bc0a..7d7fab442 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -57,7 +57,6 @@
 #include <driver/record.h>
 #include <driver/genpsi.h>
 #include <system/set_threadname.h>
-
 #include <gui/movieplayer.h>
 #include <cs_api.h>
 
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index c29e2cce9..f1f53b1ce 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -34,7 +34,6 @@ class CFrameBuffer;
 class CPlugins
 {
 	public:
-		// neutrino-internal plugin-type conversion
 		typedef enum p_type
 		{
 			P_TYPE_DISABLED = 0x1,
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 079840f64..ee329ebba 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -387,14 +387,14 @@ int CVideoSettings::showVideoSetup()
 	CMenuOptionChooser * vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, vmode_options, vmode_option_count, true, this, CRCInput::RC_nokey, "", true);
 	vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE);
 
-	CMenuOptionChooser * vs_dbdropt_ch = NULL;
-	CMenuForwarder * vs_videomodes_fw = NULL;
+	CMenuOptionChooser *vs_dbdropt_ch = NULL;
 	CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
 #ifdef BOXMODEL_CS_HD2
 	CMenuForwarder * vs_automodes_fw = NULL;
 	CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
 #endif
 	CAutoModeNotifier anotify;
+	CMenuForwarder *vs_videomodes_fw = NULL;
 	//dbdr options
 	if (system_rev != 0x01)	/* dbdr options only on COOLSTREAM */
 	{
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 7a78cca25..073b02323 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -411,10 +411,8 @@ void CNeutrinoApp::InitMenuService()
 
 	//bouquet edit
 	// TODO: this needs a neutrino restart after changing parentallock_prompt to activate :-(
-	// TODO:2 check if this deviation from upstream is still needed
 	CLockedMenuForwarder *lf;
 	lf = new CLockedMenuForwarder(LOCALE_BOUQUETEDITOR_NAME, g_settings.parentallock_pincode, g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED, true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue);
-	// TODO:2 end
 	/* does not work with CLockedMenuForwarder yet?
 	lf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
 	*/