diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp
index 4009aa5..89ef73e 100644
--- a/firmware/src/main.cpp
+++ b/firmware/src/main.cpp
@@ -34,13 +34,29 @@ val active_threshold = 100;  // Minimum value to be considered as a hit
 
 let led_refresh_on = false;
 
+void pinModeSafe(int pin, int mode)
+{
+    if (pin == -1) return;
+    pinMode(pin, mode);
+}
+
 void setup()
 {
+    // Initialize pins
+    pinModeSafe(LED_REFRESH, OUTPUT);
+    for (int pin: MUX_IN) pinModeSafe(pin, INPUT);
+    for (int pin: MUX_SEL_OUT) pinModeSafe(pin, OUTPUT);
+    for (int pin: P_BUTTON_MUX_IN) pinModeSafe(pin, INPUT);
+    for (int pin: P_MUX_SEL_OUT) pinModeSafe(pin, OUTPUT);
+    for (int pin: P_ROTARY_A) pinModeSafe(pin, INPUT);
+    for (int pin: P_ROTARY_B) pinModeSafe(pin, INPUT);
+    pinModeSafe(P_KNOB_MUX_IN, INPUT);
+    pinModeSafe(P_LED_BTN, OUTPUT);
+    pinModeSafe(P_LED_KNOB, OUTPUT);
+    pinModeSafe(P_LED_ROTARY, OUTPUT);
 
-    // Initialize pin and serial
-    for (int pin: MUX_IN) pinMode(pin, INPUT);
-    for (int pin: MUX_SEL_OUT) pinMode(pin, OUTPUT);
-    Serial.begin(9600);
+    // Initialize serial
+    Serial.begin(921600);
     Serial.printf("Initialized\r\n");
 
     start_time = timeMillis();
diff --git a/src/main.rs b/src/main.rs
index 8053442..d8f0fe1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,7 +10,7 @@ fn start() -> Result<()> {
     let midi_out = MidiOutput::new("MIDI Output")?;
     let mut conn_out = midi_out.create_virtual("Virtual MIDI Output").unwrap();
 
-    let serial_port = serialport::new("/dev/cu.usbserial-142140", 9600)
+    let serial_port = serialport::new("/dev/cu.wchusbserial1450", 9600)
         .timeout(std::time::Duration::from_millis(10))
         .open()?;
     let mut reader = BufReader::new(serial_port);