diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index ebf96eca4..50c265261 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -211,10 +211,12 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] =
 	{LOCALE_EXTRA_KEY_NEXT43MODE,		&g_settings.key_next43mode,		NONEXISTANT_LOCALE},
 	{LOCALE_EXTRA_KEY_SWITCHFORMAT,		&g_settings.key_switchformat,		NONEXISTANT_LOCALE},
 	{LOCALE_EXTRA_KEY_SCREENSHOT,		&g_settings.key_screenshot,		LOCALE_MENU_HINT_KEY_SCREENSHOT },
+#if ENABLE_PIP
 	{LOCALE_EXTRA_KEY_PIP_CLOSE,		&g_settings.key_pip_close,		LOCALE_MENU_HINT_KEY_PIP_CLOSE },
 	{LOCALE_EXTRA_KEY_PIP_CLOSE_AVINPUT,	&g_settings.key_pip_close_avinput,	NONEXISTANT_LOCALE /*LOCALE_MENU_HINT_KEY_PIP_CLOSE_AVINPUT*/ },
 	{LOCALE_EXTRA_KEY_PIP_SETUP,		&g_settings.key_pip_setup,		LOCALE_MENU_HINT_KEY_PIP_SETUP },
 	{LOCALE_EXTRA_KEY_PIP_SWAP,		&g_settings.key_pip_swap,		LOCALE_MENU_HINT_KEY_PIP_CLOSE },
+#endif
 	{LOCALE_EXTRA_KEY_FORMAT_MODE,		&g_settings.key_format_mode_active,	LOCALE_MENU_HINT_KEY_FORMAT_MODE_ACTIVE },
 	{LOCALE_EXTRA_KEY_PIC_MODE,		&g_settings.key_pic_mode_active,	LOCALE_MENU_HINT_KEY_PIC_MODE_ACTIVE },
 	{LOCALE_EXTRA_KEY_PIC_SIZE,		&g_settings.key_pic_size_active,	LOCALE_MENU_HINT_KEY_PIC_SIZE_ACTIVE },
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e8f875c05..5838d59d3 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -5172,6 +5172,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
 			InfoIcons->saveIconstate();
 
 		CEpgScan::getInstance()->Start(true);
+
 		bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus();
 		if (!alive && cpuFreq)
 			cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index f2f3eefd4..727ec9372 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -50,7 +50,9 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
 	{"personalize_games"			, CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},	
 	{"personalize_tools"			, CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
 	{"personalize_avinput"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
+#if ENABLE_PIP
 	{"personalize_avinput_pip"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
+#endif
 	{"personalize_scripts"			, CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
 	{"personalize_lua"			, CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
 	{"personalize_settings"			, CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
diff --git a/src/system/settings.h b/src/system/settings.h
index 5f4e02704..b8865cbed 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -660,7 +660,9 @@ struct SNeutrinoSettings
 		P_MAIN_GAMES,
 		P_MAIN_TOOLS,
 		P_MAIN_AVINPUT,
+#if ENABLE_PIP
 		P_MAIN_AVINPUT_PIP,
+#endif
 		P_MAIN_SCRIPTS,
 		P_MAIN_LUA,
 		P_MAIN_SETTINGS,
@@ -1203,10 +1205,12 @@ struct SNeutrinoSettings
 	int key_pageup;
 	int key_pic_mode_active;
 	int key_pic_size_active;
+#if ENABLE_PIP
 	int key_pip_close;
 	int key_pip_close_avinput;
 	int key_pip_setup;
 	int key_pip_swap;
+#endif
 	int key_power_off;
 	int key_quickzap_down;
 	int key_quickzap_up;