diff --git a/flight/OpenPilot/UAVObjects/homelocation.c b/flight/OpenPilot/UAVObjects/homelocation.c
index 8adb101b4..a3fc36ebd 100644
--- a/flight/OpenPilot/UAVObjects/homelocation.c
+++ b/flight/OpenPilot/UAVObjects/homelocation.c
@@ -73,7 +73,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
 	// Initialize object fields to their default values
 	UAVObjGetInstanceData(obj, instId, &data);
 	memset(&data, 0, sizeof(HomeLocationData));
-    data.Set = -1;
+    data.Set = 0;
     data.Latitude = 0;
     data.Longitude = 0;
     data.Altitude = 0;
diff --git a/ground/src/plugins/uavobjects/homelocation.cpp b/ground/src/plugins/uavobjects/homelocation.cpp
index 7b2782238..e3e83576f 100644
--- a/ground/src/plugins/uavobjects/homelocation.cpp
+++ b/ground/src/plugins/uavobjects/homelocation.cpp
@@ -111,7 +111,7 @@ UAVObject::Metadata HomeLocation::getDefaultMetadata()
  */
 void HomeLocation::setDefaultFieldValues()
 {
-    data.Set = -1;
+    data.Set = 0;
     data.Latitude = 0;
     data.Longitude = 0;
     data.Altitude = 0;
diff --git a/ground/src/plugins/uavobjects/navigationsettings.cpp b/ground/src/plugins/uavobjects/navigationsettings.cpp
index 62271dc8a..82eb4b6b1 100644
--- a/ground/src/plugins/uavobjects/navigationsettings.cpp
+++ b/ground/src/plugins/uavobjects/navigationsettings.cpp
@@ -47,7 +47,7 @@ NavigationSettings::NavigationSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISS
     fields.append( new UAVObjectField(QString("UpdatePeriod"), QString("ms"), UAVObjectField::UINT16, UpdatePeriodElemNames, QStringList()) );
     QStringList AccelerationMaxElemNames;
     AccelerationMaxElemNames.append("0");
-    fields.append( new UAVObjectField(QString("AccelerationMax"), QString("m/s"), UAVObjectField::FLOAT32, AccelerationMaxElemNames, QStringList()) );
+    fields.append( new UAVObjectField(QString("AccelerationMax"), QString("m/sē"), UAVObjectField::FLOAT32, AccelerationMaxElemNames, QStringList()) );
     QStringList SpeedMaxElemNames;
     SpeedMaxElemNames.append("0");
     fields.append( new UAVObjectField(QString("SpeedMax"), QString("m/s"), UAVObjectField::FLOAT32, SpeedMaxElemNames, QStringList()) );
diff --git a/ground/src/shared/uavobjectdefinition/homelocation.xml b/ground/src/shared/uavobjectdefinition/homelocation.xml
index 03f8dbba8..b62c79631 100644
--- a/ground/src/shared/uavobjectdefinition/homelocation.xml
+++ b/ground/src/shared/uavobjectdefinition/homelocation.xml
@@ -1,6 +1,6 @@
 <xml>
   <object name="HomeLocation" singleinstance="true" settings="true">
-    <field name="Set" units="" type="enum" elements="1" options="FALSE,TRUE" defaultvalue="false"/>
+    <field name="Set" units="" type="enum" elements="1" options="FALSE,TRUE" defaultvalue="FALSE"/>
     <field name="Latitude" units="deg * 10e6" type="int32" elements="1" defaultvalue="0"/>
     <field name="Longitude" units="deg * 10e6" type="int32" elements="1" defaultvalue="0"/>
     <field name="Altitude" units="m over geoid" type="float" elements="1" defaultvalue="0"/>