diff --git a/packages/ctl/src/commands_host.ts b/packages/ctl/src/commands_host.ts
index 1f343181..77ab6936 100644
--- a/packages/ctl/src/commands_host.ts
+++ b/packages/ctl/src/commands_host.ts
@@ -219,7 +219,7 @@ hostConfigCommands.add(new lib.Command({
 		let editor = await getEditor(args.editor);
 		if (editor === undefined) {
 			throw new lib.CommandError(`No editor avalible. Checked CLI input, EDITOR and VISUAL env vars
-							  Try "ctl controller config edit <editor of choice>"`);
+							  Try "ctl host config edit <editor of choice>"`);
 		}
 		let disallowedList = {"host.id": 0};
 		let allConfigElements = serializedConfigToString(
diff --git a/packages/ctl/src/commands_instance.ts b/packages/ctl/src/commands_instance.ts
index 6a1f79ad..bedd78eb 100644
--- a/packages/ctl/src/commands_instance.ts
+++ b/packages/ctl/src/commands_instance.ts
@@ -156,7 +156,7 @@ instanceConfigCommands.add(new lib.Command({
 		let editor = await getEditor(args.editor);
 		if (editor === undefined) {
 			throw new lib.CommandError(`No editor avalible. Checked CLI input, EDITOR and VISUAL env vars
-							  Try "ctl controller config edit <editor of choice>"`);
+							  Try "ctl instance config edit <editor of choice>"`);
 		}
 		let disallowedList = {"instance.id": 0, "instance.assigned_host": 0, "factorio.settings": 0};
 		let allConfigElements = serializedConfigToString(
diff --git a/packages/ctl/src/config_ops.ts b/packages/ctl/src/config_ops.ts
index bf0e8a4b..09299657 100644
--- a/packages/ctl/src/config_ops.ts
+++ b/packages/ctl/src/config_ops.ts
@@ -16,7 +16,7 @@ export async function configToKeyVal(data: string) {
 	for (let index in filtered) {
 		if (index in filtered) {
 			let split = filtered[index].split("=");
-			let finalIndex = filtered[index][0].trim();
+			let finalIndex = split[0].trim();
 			// split on the = we added earlier, giving us both value and key
 			let part = "";
 			try {
diff --git a/test/ctl/config_ops.test.js b/test/ctl/config_ops.test.js
new file mode 100644
index 00000000..5d3921e1
--- /dev/null
+++ b/test/ctl/config_ops.test.js
@@ -0,0 +1,21 @@
+import assert from "node:assert/strict";
+import { configToKeyVal } from "@clusterio/ctl/dist/node/src/config_ops.js";
+
+describe("ctl/config_ops", function() {
+	it("preserves full field names with LF and CRLF input", async function() {
+		for (let newline of ["\n", "\r\n"]) {
+			const data = [
+				"# Clusterio configuration",
+				"",
+				"instance.name = Example",
+				"inventory_sync.load_plugin = false",
+				"",
+			].join(newline);
+
+			assert.deepEqual(await configToKeyVal(data), {
+				"instance.name": "Example",
+				"inventory_sync.load_plugin": "false",
+			});
+		}
+	});
+});