diff --git a/platformio.ini b/platformio.ini
index 51d4fbd78..c98d3438f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,10 +17,10 @@ core_build_flags =
   -D NDEBUG
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
-  -std=gnu++17
+  ; -std=gnu++17
 
-core_unbuild_flags = -std=gnu++11
-; core_unbuild_flags =
+; core_unbuild_flags = -std=gnu++11
+core_unbuild_flags =
 
 ; my_build_flags is set in pio_local.ini
 my_build_flags =
diff --git a/src/command.cpp b/src/command.cpp
index 7486a617d..fd6325f0b 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -338,7 +338,7 @@ uint8_t Command::call(const uint8_t device_type, const char * cmd, const char *
         snprintf(info_s, sizeof(info_s), "'%s/%s'", dname, cmd);
     }
     if ((value == nullptr) || (strlen(value) == 0)) {
-        LOG_INFO(("%sCalling command %s"), ro.c_str(), info_s);
+        LOG_DEBUG(("%sCalling command %s"), ro.c_str(), info_s);
     } else {
         if (id > 0) {
             LOG_INFO(("%sCalling command %s with value %s and id %d on device 0x%02X"), ro.c_str(), info_s, value, id, device_id);
diff --git a/src/shower.cpp b/src/shower.cpp
index 865877570..ea40bf7fa 100644
--- a/src/shower.cpp
+++ b/src/shower.cpp
@@ -111,9 +111,11 @@ void Shower::loop() {
                             char dt[25];
                             strftime(dt, sizeof(dt), "%FT%T%z", tm_);
                             doc["timestamp"] = dt;
+                            LOG_INFO("shower finished (duration %s)", dt);
+                        } else {
+                            LOG_INFO("shower finished (duration %lu s)", duration_);
                         }
                         Mqtt::queue_publish("shower_data", doc.as<JsonObject>());
-                        LOG_INFO("finished with duration %lu seconds", duration_);
                     }
                 }