diff --git a/examples/Threading/Demo_Shared_Counter/Consumer.inot b/examples/Threading/Demo_Shared_Counter/Consumer.inot
index 9d2d190..5030a61 100644
--- a/examples/Threading/Demo_Shared_Counter/Consumer.inot
+++ b/examples/Threading/Demo_Shared_Counter/Consumer.inot
@@ -1,7 +1,10 @@
-void setup() {
-
+void setup()
+{
+  Serial.begin(9600);
+  while(!Serial) { }
 }
 
-void loop() {
+void loop()
+{
   Serial.println(counter);
 }
diff --git a/examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino b/examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino
index aa71781..51377e8 100644
--- a/examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino
+++ b/examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino
@@ -1,8 +1,5 @@
 void setup()
 {
-  Serial.begin(115200);
-  while (!Serial) { }
-
   Producer.start();
   Consumer.start();
 }
diff --git a/examples/Threading/Demo_Shared_Counter/Producer.inot b/examples/Threading/Demo_Shared_Counter/Producer.inot
index 8932873..59a76a9 100644
--- a/examples/Threading/Demo_Shared_Counter/Producer.inot
+++ b/examples/Threading/Demo_Shared_Counter/Producer.inot
@@ -1,8 +1,10 @@
-void setup() {
+void setup()
+{
 
 }
 
-void loop() {
+void loop()
+{
   static int i = 0;
   counter = i;
   i++;
diff --git a/examples/Threading/Demo_Source_Sink_Counter/Consumer.inot b/examples/Threading/Demo_Source_Sink_Counter/Consumer.inot
index b03acdb..57b217a 100644
--- a/examples/Threading/Demo_Source_Sink_Counter/Consumer.inot
+++ b/examples/Threading/Demo_Source_Sink_Counter/Consumer.inot
@@ -2,7 +2,8 @@ SINK(counter, int, 10);
 
 void setup()
 {
-
+  Serial.begin(9600);
+  while(!Serial) { }
 }
 
 void loop()
diff --git a/examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino b/examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino
index d3007b3..b5381af 100644
--- a/examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino
+++ b/examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino
@@ -4,12 +4,14 @@
  * together using the "connectTo" method.
  */
 
-void setup() {
+void setup()
+{
   Source_Thread.led.connectTo(Sink_Thread.led);
   Sink_Thread.start();
   Source_Thread.start();
 }
 
-void loop() {
+void loop()
+{
   rtos::ThisThread::yield();
 }
diff --git a/examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino b/examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino
index 30fd6e3..38dfda2 100644
--- a/examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino
+++ b/examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino
@@ -75,6 +75,9 @@ byte bmp388_read_reg(byte const reg_addr)
 
 void bmp388_thread_func()
 {
+  Serial.begin(9600);
+  while(!Serial) { }
+
   for(;;)
   {
     /* Sleep between 5 and 500 ms */
diff --git a/examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino b/examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
index e1614d7..5ebf5f5 100644
--- a/examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
+++ b/examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
@@ -35,9 +35,6 @@ static char thread_name[NUM_THREADS][32];
 
 void setup()
 {
-  Serial.begin(9600);
-  while (!Serial) { }
-
   pinMode(BMP388_CS_PIN, OUTPUT);
   digitalWrite(BMP388_CS_PIN, HIGH);
 
@@ -70,6 +67,9 @@ byte bmp388_read_reg(byte const reg_addr)
 
 void bmp388_thread_func()
 {
+  Serial.begin(9600);
+  while(!Serial) { }
+
   for(;;)
   {
     /* Sleep between 5 and 500 ms */
diff --git a/examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino b/examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino
index 6372534..c15cf5d 100644
--- a/examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino
+++ b/examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino
@@ -34,9 +34,6 @@ static char thread_name[NUM_THREADS][32];
 
 void setup()
 {
-  Serial.begin(9600);
-  while (!Serial) { }
-
   /* Fire up some threads all accessing the LSM6DSOX */
   for(size_t i = 0; i < NUM_THREADS; i++)
   {
@@ -76,6 +73,9 @@ byte lsm6dsox_read_reg(byte const reg_addr)
 
 void lsm6dsox_thread_func()
 {
+  Serial.begin(9600);
+  while(!Serial) { }
+
   for(;;)
   {
     /* Sleep between 5 and 500 ms */
diff --git a/examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino b/examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
index 5fe3718..062841d 100644
--- a/examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
+++ b/examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
@@ -34,9 +34,6 @@ static char thread_name[NUM_THREADS][32];
 
 void setup()
 {
-  Serial.begin(9600);
-  while (!Serial) { }
-
   /* Fire up some threads all accessing the LSM6DSOX */
   for(size_t i = 0; i < NUM_THREADS; i++)
   {
@@ -64,6 +61,9 @@ byte lsm6dsox_read_reg(byte reg_addr)
 
 void lsm6dsox_thread_func()
 {
+  Serial.begin(9600);
+  while(!Serial) { }
+
   for(;;)
   {
     /* Sleep between 5 and 500 ms */