diff --git a/esp32/include/ControllerConfiguration.h b/esp32/include/ControllerConfiguration.h
index cc1485c..1040b78 100644
--- a/esp32/include/ControllerConfiguration.h
+++ b/esp32/include/ControllerConfiguration.h
@@ -85,7 +85,7 @@
 #define FIRMWARE_VERSION "sw 2.0 hw 0.10b"
 
 #define TIMED_LIGHT_PIN CUSTOM1_PIN5
-#define FLOWMETER_PIN CUSTOM1_PIN1
+//#define FLOWMETER_PIN CUSTOM1_PIN1
 #ifdef FLOWMETER_PIN
     #define FLOWMETER_FLOWFACTOR 23 /** F = 22 * Q;Q = L/min */
 #endif
diff --git a/esp32/platformio.ini b/esp32/platformio.ini
index 110308f..c6aac22 100644
--- a/esp32/platformio.ini
+++ b/esp32/platformio.ini
@@ -12,7 +12,7 @@
 platform = espressif32
 board = esp32doit-devkit-v1
 framework = arduino
-build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -fexceptions -lstdc++-exc
+build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
 board_build.partitions = defaultWithSmallerSpiffs.csv
 
 
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index a52ad89..4d71e09 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -641,7 +641,6 @@ void pumpActiveLoop()
 
 void safeSetup()
 {
-  throw std::runtime_error("Shit happened");
   /* reduce power consumption */
   setCpuFrequencyMhz(80);
 
@@ -1039,7 +1038,8 @@ bool determineTimedLightState(bool lowLight)
       ((hoursStart < hoursEnd) &&
        (getCurrentHour() >= hoursStart && getCurrentHour() <= hoursEnd)))
   {
-    if (!timedLightLowVoltageTriggered && battery.getVoltage(BATTSENSOR_INDEX_BATTERY) >= timedLightVoltageCutoff.get())
+    bool voltageOk = !timedLightLowVoltageTriggered && battery.getVoltage(BATTSENSOR_INDEX_BATTERY) >= timedLightVoltageCutoff.get();
+    if (voltageOk || equalish(timedLightVoltageCutoff.get(), -1))
     {
       timedLightNode.setProperty("state").send(String("On"));
       return true;