diff --git a/.gitignore b/.gitignore
index 17b41c76c..b57f248a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@
 # /flight/PipBee/
 /flight/PipBee/Build
 
+# /flight/Project/OpenPilotOSX/
+/flight/Project/OpenPilotOSX/build/
+
 # /ground/
 /ground/Build
 
diff --git a/flight/Modules/Battery/battery.c b/flight/Modules/Battery/battery.c
index 5c67da14e..afcfd9300 100644
--- a/flight/Modules/Battery/battery.c
+++ b/flight/Modules/Battery/battery.c
@@ -131,7 +131,7 @@ static void onTimer(UAVObjEvent* ev)
 
 	//calculate the battery parameters
 	if (voltageADCPin >=0) {
-		flightBatteryData.Voltage = ((float)PIOS_ADC_PinGet(voltageADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_VOLTAGEFACTOR]; //in Volts		
+		flightBatteryData.Voltage = ((float)PIOS_ADC_PinGet(voltageADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_VOLTAGEFACTOR]; //in Volts
 	}
 	if (currentADCPin >=0) {
 		flightBatteryData.Current = ((float)PIOS_ADC_PinGet(currentADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_CURRENTFACTOR]; //in Amps
diff --git a/flight/Revolution/System/inc/pios_config_sim.h b/flight/Revolution/System/inc/pios_config_sim.h
index db1881387..325d90483 100644
--- a/flight/Revolution/System/inc/pios_config_sim.h
+++ b/flight/Revolution/System/inc/pios_config_sim.h
@@ -74,5 +74,6 @@
 #define CPULOAD_LIMIT_CRITICAL		95
 
 #define REVOLUTION
+#define SIM_OSX
 
 #endif /* PIOS_CONFIG_POSIX_H */
diff --git a/flight/Revolution/System/pios_board_sim.c b/flight/Revolution/System/pios_board_sim.c
index e54eaa8fc..4b7f26dc5 100644
--- a/flight/Revolution/System/pios_board_sim.c
+++ b/flight/Revolution/System/pios_board_sim.c
@@ -52,12 +52,12 @@ void Stack_Change_Weak() {
 
 const struct pios_tcp_cfg pios_tcp_telem_cfg = {
   .ip = "0.0.0.0",
-  .port = 9001,
+  .port = 9000,
 };
 
 const struct pios_udp_cfg pios_udp_telem_cfg = {
 	.ip = "0.0.0.0",
-	.port = 9001,
+	.port = 9000,
 };
 
 const struct pios_tcp_cfg pios_tcp_gps_cfg = {