diff --git a/src/cfgfile.c b/src/cfgfile.c
index 9010069..205d283 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -797,13 +797,15 @@ static int cfgfile_parse_host (struct uae_prefs *p, char *option, char *value)
 		return 1;
 		#ifdef GEKKO
 	    if (cfgfile_path_noexpand (option, value, "floppy_path"))
+		return 1;
+		if (cfgfile_path_noexpand (option, value, "hardfile_path"))
 		return 1;
 		#else
 		if (cfgfile_path (option, value, "floppy_path"))
 		return 1;
-		#endif
 	    if (cfgfile_path (option, value, "hardfile_path"))
 		return 1;
+		#endif
 #ifdef SAVESTATE
 	    if (cfgfile_path (option, value, "savestate_path"))
 		return 1;
diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c
index bef7ab9..d20fcff 100644
--- a/src/gui-sdl/gui-sdl.c
+++ b/src/gui-sdl/gui-sdl.c
@@ -193,7 +193,7 @@ static const char *other_messages[] = {
 };
 
 static const char *save_conf_messages[] = {
-		/*00*/		"Save conf file to load at start up (uaerc.saved)",
+		/*00*/		"Save conf file to load at start (uaerc.saved)",
 		/*01*/		" ",
 		/*02*/		"Save confs file 1",
 		/*03*/		" ",