diff --git a/app/Editor.java b/app/Editor.java
index 3348a18bc..80e0e39a1 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -657,7 +657,7 @@ public class Editor extends JFrame
 	JMenuItem rbMenuItem;
 	JMenuItem cbMenuItem;
 	SerialRateMenuListener		srml = new SerialRateMenuListener();
-	// Enumeration portRates = {"9600","19200","38400","57600","115200"};
+	String[] portRates = {"9600","19200","38400","57600","115200"};
     
 	serialMenuListener  = new SerialMenuListener();
 
@@ -701,23 +701,15 @@ public class Editor extends JFrame
 	//serialSubMenu.addSeparator();
 	ButtonGroup group = new ButtonGroup();
 
-	int curr_rate = Preferences.getInteger("serial.debug_rate");
-
-	rbMenuItem = new JCheckBoxMenuItem("9600", 9600 == curr_rate);
-	rbMenuItem.addActionListener(srml);
-	group.add(rbMenuItem);
-	serialRateSubMenu.add(rbMenuItem);
-
-	rbMenuItem = new JCheckBoxMenuItem("19200", 19200  == curr_rate);
-	rbMenuItem.addActionListener(srml);
-	group.add(rbMenuItem);
-	serialRateSubMenu.add(rbMenuItem);	
-
-	rbMenuItem = new JCheckBoxMenuItem("115200", 115200  == curr_rate);
-	rbMenuItem.addActionListener(srml);
-	group.add(rbMenuItem);
-	serialRateSubMenu.add(rbMenuItem);	
+	String curr_rate = Preferences.get("serial.debug_rate");
 
+    for (int i = 0; i < portRates.length; i++) {
+      rbMenuItem = new JCheckBoxMenuItem(portRates[i], portRates[i].equals(curr_rate));
+      rbMenuItem.addActionListener(srml);
+      group.add(rbMenuItem);
+      serialRateSubMenu.add(rbMenuItem);
+    }
+    
 	menu.add(serialRateSubMenu);
     
     menu.addMenuListener(new MenuListener() {
diff --git a/targets/arduino/wiring.c b/targets/arduino/wiring.c
index 4f2356342..f8d6d59b4 100755
--- a/targets/arduino/wiring.c
+++ b/targets/arduino/wiring.c
@@ -176,7 +176,7 @@ void analogWrite(int pin, int val)
 		digitalWrite(pin, HIGH);
 }
 
-void beginSerial(int baud)
+void beginSerial(long baud)
 {
 	uartInit();
 	uartSetBaudRate(baud);
diff --git a/targets/arduino/wiring.h b/targets/arduino/wiring.h
index 87ccdd2ce..c62814877 100755
--- a/targets/arduino/wiring.h
+++ b/targets/arduino/wiring.h
@@ -66,7 +66,7 @@ int analogRead(int);
 unsigned long millis(void);
 void setup(void);
 void loop(void);
-void beginSerial(int);
+void beginSerial(long);
 void serialWrite(unsigned char);
 int serialAvailable();
 int serialRead();