diff --git a/lib/hardware/coolstream/hardware_caps.cpp b/lib/hardware/coolstream/hardware_caps.cpp
index 065906448..156c6ea5d 100644
--- a/lib/hardware/coolstream/hardware_caps.cpp
+++ b/lib/hardware/coolstream/hardware_caps.cpp
@@ -39,9 +39,12 @@ hw_caps_t *get_hwcaps(void) {
 	case 6:
 	case 7: // Black Stallion Edition
 		strcpy(caps.boxname, "HD1");
+		strcpy(caps.boxarch, "Nevis");
 		caps.force_tuner_2G = 1;
 		break;
+	case 8:
 		strcpy(caps.boxname, "Neo"); // see dirty part of hw_caps in neutrino.cpp
+		strcpy(caps.boxarch, "Nevis");
 		caps.force_tuner_2G = 1;
 		break;
 	case 9:
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index aa45d5d64..d2076e70f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -492,7 +492,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0);
 
 	g_settings.shutdown_min = 0;
-	if (g_info.hw_caps->can_shutdown || cs_get_revision() == 1)
+	if (g_info.hw_caps->can_shutdown)
 		g_settings.shutdown_min = configfile.getInt32("shutdown_min", 180);
 	g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0);
 
@@ -2197,7 +2197,7 @@ TIMER_START();
 	cs_new_auto_videosystem();
 #endif
 
-	g_info.hw_caps  = get_hwcaps();
+	g_info.hw_caps = get_hwcaps();
 
 	g_Locale        = new CLocaleManager;