diff --git a/Source/Processors/Editors/SerialInputEditor.cpp b/Source/Processors/Editors/SerialInputEditor.cpp
index a9d802bbb00c043789772d23b773f8f8727b38d3..836e388720bab051d516378acbfaf88e4c56e99b 100644
--- a/Source/Processors/Editors/SerialInputEditor.cpp
+++ b/Source/Processors/Editors/SerialInputEditor.cpp
@@ -53,7 +53,7 @@ SerialInputEditor::SerialInputEditor(SerialInput* parentNode)
     
     for (int i = 0; i < baudrates.size(); i++)
     {
-        baudrateList->addItem(std::to_string(baudrates[i]), baudrates[i]);
+        baudrateList->addItem(String(baudrates[i]), baudrates[i]);
     }
     
     addAndMakeVisible(baudrateList);
diff --git a/Source/Processors/SerialInput.cpp b/Source/Processors/SerialInput.cpp
index 2c68d73efb83c6a1b6ac0973ba3168a684ef15d2..904e8e0991de95f702d3b30f3e5cb07985ed3f8f 100644
--- a/Source/Processors/SerialInput.cpp
+++ b/Source/Processors/SerialInput.cpp
@@ -30,6 +30,7 @@ const int SerialInput::BAUDRATES[12] = {300, 1200, 2400, 4800, 9600, 14400, 1920
 SerialInput::SerialInput()
 : GenericProcessor("Serial Port")
 {
+    baudrate = 0;
     // ToDo: One day, this should use the Parameter class, and it will look roughly like this:
     //parameters.add(Parameter("device", varArray(getDevices()), 0, 0, true));
     //parameters.add(Parameter("baudrate", varArray(getBaudrates()), 6, 1, true));
diff --git a/Source/Processors/SerialInput.h b/Source/Processors/SerialInput.h
index c22722c3de3fc64551e74a975a903a9e10c5bc03..9aee1baec754ec7c77e1dc1d2eb1542474595b5d 100644
--- a/Source/Processors/SerialInput.h
+++ b/Source/Processors/SerialInput.h
@@ -119,7 +119,7 @@ private:
     string device;
     
     // The baudrate to be used
-    int baudrate = 0;
+    int baudrate;
 
     // List of baudrates that are available by default.
     static const int BAUDRATES[12];