diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -379,7 +379,7 @@ void ReconsiderGameScriptLanguage()
 	if (_current_data == NULL) return;
 
 	char temp[MAX_PATH];
-	strecpy(temp, _current_language->file, temp + sizeof(temp));
+	strecpy(temp, _current_language->file, lastof(temp));
 
 	/* Remove the extension */
 	char *l = strrchr(temp, '.');
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -197,10 +197,10 @@ void ScriptConfig::SettingsToString(char
 		/* If it doesn't fit, skip the next settings */
 		if (string + needed_size > last) break;
 
-		s = strecat(s, last, (*it).first);
-		s = strecat(s, last, "=");
-		s = strecat(s, last, no);
-		s = strecat(s, last, ",");
+		s = strecat(s, (*it).first, last);
+		s = strecat(s, "=", last);
+		s = strecat(s, no, last);
+		s = strecat(s, ",", last);
 	}
 
 	/* Remove the last ',', but only if at least one setting was saved. */