diff --git a/changelog.md b/changelog.md
index 6e1cd4b..7dfef4b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,19 @@
 ## grblHAL changelog
 
+<a name="20250706">Build 20250706
+
+Core:
+
+* Updated serial stream format options. Fix for compiler warning.
+
+Drivers:
+
+* RP2040: fix for VSCode\(?\) issue - not updating build files on SDK change, ref. issue [#140](https://github.com/grblHAL/RP2040/issues/140).
+
+* ESP32, iMXRT1062, RP2040, SAM3X8E, STM32F4xx, STM32F7xx: added basic support for setting serial stream format, parity only for now.
+
+---
+
 <a name="20250705">Build 20250705
 
 Core:
diff --git a/settings.c b/settings.c
index 0e10fcc..0fa8aec 100644
--- a/settings.c
+++ b/settings.c
@@ -355,7 +355,7 @@ PROGMEM const settings_t defaults = {
     .safety_door.coolant_on_delay = DEFAULT_SAFETY_DOOR_COOLANT_DELAY,
 
     .modbus_baud = DEFAULT_MODBUS_STREAM_BAUD,
-    .modbus_stream_format = (DEFAULT_MODBUS_STREAM_PARITY << 4),
+    .modbus_stream_format.value = (DEFAULT_MODBUS_STREAM_PARITY << 4),
 
     .rgb_strip.length0 = DEFAULT_RGB_STRIP0_LENGTH,
     .rgb_strip.length1 = DEFAULT_RGB_STRIP1_LENGTH
diff --git a/stream.h b/stream.h
index 8947a1b..df27cb5 100644
--- a/stream.h
+++ b/stream.h
@@ -97,9 +97,9 @@ typedef enum {
 } serial_width_t;
 
 typedef enum {
-    Serial_StopBits2 = 0,
+    Serial_StopBits1 = 0,
     Serial_StopBits1_5,
-    Serial_StopBits1,
+    Serial_StopBits2,
     Serial_StopBits0_5,
 } serial_stopbits_t;
 
@@ -107,7 +107,8 @@ typedef enum {
     Serial_ParityNone = 0,
     Serial_ParityEven,
     Serial_ParityOdd,
-    Serial_ParityMarkSPace,
+    Serial_ParityMark,
+    Serial_ParitySpace,
 } serial_parity_t;
 
 typedef union {
@@ -115,8 +116,8 @@ typedef union {
     struct {
         uint8_t width    :2,
                 stopbits :2,
-                parity   :2,
-                unused   :2;
+                parity   :3,
+                unused   :1;
     };
 } serial_format_t;
 
diff --git a/system.h b/system.h
index bd69cf4..3778581 100644
--- a/system.h
+++ b/system.h
@@ -50,14 +50,14 @@ know when there is a realtime command to execute.
 #define EXEC_RESET              bit(5)
 #define EXEC_SAFETY_DOOR        bit(6)
 #define EXEC_MOTION_CANCEL      bit(7)
-#define EXEC_MOTION_CANCEL_FAST bit(7)
-#define EXEC_SLEEP              bit(8)
-#define EXEC_TOOL_CHANGE        bit(9)
-#define EXEC_PID_REPORT         bit(10)
-#define EXEC_GCODE_REPORT       bit(11)
-#define EXEC_TLO_REPORT         bit(12)
-#define EXEC_RT_COMMAND         bit(13)
-#define EXEC_DOOR_CLOSED        bit(14)
+#define EXEC_MOTION_CANCEL_FAST bit(7) // Permanently enabled for now
+#define EXEC_SLEEP              bit(9)
+#define EXEC_TOOL_CHANGE        bit(10)
+#define EXEC_PID_REPORT         bit(11)
+#define EXEC_GCODE_REPORT       bit(12)
+#define EXEC_TLO_REPORT         bit(13)
+#define EXEC_RT_COMMAND         bit(14)
+#define EXEC_DOOR_CLOSED        bit(15)
 ///@}
 
 //! \def sys_state