diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index bf938f1e4..c21d680bb 100644
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -503,7 +503,7 @@ void guiMouseFunc(int button, int updown, int x, int y)
                     
                 case MOUSE_YOKE:
                     mouse_mode = MOUSE_VIEW;
-		    fgSetString("/sim/control/mode", "joystick");
+		    fgSetString("/sim/control-mode", "joystick");
                     x = fgGetInt("/sim/startup/xsize")/2;
                     y = fgGetInt("/sim/startup/ysize")/2;
                     _mVtoggle = 0;
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 0cb6bebb2..737cbf776 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -561,11 +561,11 @@ parse_option (const string& arg)
     } else if ( arg.find( "--lon=" ) != string::npos ) {
 	fgSetDouble("/position/longitude",
 			      parse_degree(arg.substr(6)));
-	fgSetString("/position/airport-id", "");
+	fgSetString("/sim/startup/airport-id", "");
     } else if ( arg.find( "--lat=" ) != string::npos ) {
 	fgSetDouble("/position/latitude",
 			      parse_degree(arg.substr(6)));
-	fgSetString("/position/airport-id", "");
+	fgSetString("/sim/startup/airport-id", "");
     } else if ( arg.find( "--altitude=" ) != string::npos ) {
 	fgSetBool("/sim/startup/onground", false);
 	if ( fgGetString("/sim/startup/units") == "feet" )