diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index b24ff49bb..10b05691d 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -10,9 +10,9 @@
 #include "bus_wrapper.h"
 #include <Arduino.h>
 
-#define GET_BIT(var,bit)    ((var>>bit)&0x01)
-#define SET_BIT(var,bit)    (var|=(uint16_t)(0x0001<<bit))
-#define UNSET_BIT(var,bit)  (var&=(~(uint16_t)(0x0001<<bit)))
+#define GET_BIT(var,bit)    (((var)>>(bit))&0x01)
+#define SET_BIT(var,bit)    ((var)|=(uint16_t)(0x0001<<(bit)))
+#define UNSET_BIT(var,bit)  ((var)&=(~(uint16_t)(0x0001<<(bit))))
 
 //temporary struct for passing bus configuration to bus
 struct BusConfig {
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 9221ccf22..e4cf1b893 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -121,8 +121,8 @@
           d.getElementById("LC").readOnly = !(type > 31 && type < 48);    // not analog
           if (change) {
             d.getElementById("ew"+n).checked = (type == 30 || type == 31 || type == 44 || type == 45); // RGBW checkbox, TYPE_xxxx values from const.h
+            d.getElementById("ew"+n).onclick = (type > 31 && type < 48) ? (function(){return false}) : (function(){});  // prevent change for analog
           }
-          d.getElementById("ew"+n).readOnly = (type > 31 && type < 48);   // analog
           isRGBW |= d.getElementById("ew"+n).checked;
           d.getElementById("dig"+n).style.display = (type > 31 && type < 48) ? "none":"inline";
           d.getElementById("psd"+n).innerHTML = (type > 31 && type < 48) ? "Index:":"Start:";
diff --git a/wled00/wled.h b/wled00/wled.h
index 2c61ae0be..e692a1f03 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2102270
+#define VERSION 2102271
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG