diff --git a/flight/OpenPilot/Modules/GPS/GPS.c b/flight/OpenPilot/Modules/GPS/GPS.c
index cce355c36..89875a746 100644
--- a/flight/OpenPilot/Modules/GPS/GPS.c
+++ b/flight/OpenPilot/Modules/GPS/GPS.c
@@ -250,7 +250,7 @@ static void setHomeLocation(GPSPositionData * gpsData)
         home.Altitude  = gpsData->Altitude + gpsData->GeoidSeparation;
         
         // Compute home ECEF coordinates and the rotation matrix into NED
-        double LLA[3] = {(double) home.Latitude / 10e6, (double) home.Longitude / 10e6, (double) home.Altitude};
+        double LLA[3] = {((double) home.Latitude) / 10e6, ((double) home.Longitude) / 10e6, ((double) home.Altitude)};
         double ECEF[3];
         RneFromLLA(LLA, (float (*)[3]) home.RNE);
         LLA2ECEF(LLA, ECEF);
diff --git a/ground/src/libs/utils/coordinateconversions.cpp b/ground/src/libs/utils/coordinateconversions.cpp
index 96c7b98da..6e5f31c67 100644
--- a/ground/src/libs/utils/coordinateconversions.cpp
+++ b/ground/src/libs/utils/coordinateconversions.cpp
@@ -30,9 +30,10 @@
 #include "coordinateconversions.h"
 #include <stdint.h>
 #include <QDebug>
+#include <math.h>
 
-#define RAD2DEG (180.0/3.14)
-#define DEG2RAD (3.14/180.0)
+#define RAD2DEG (180.0/M_PI)
+#define DEG2RAD (M_PI/180.0)
 
 namespace Utils {