diff --git a/.eslintrc.js b/.eslintrc.js
index f82a6194..19bddc01 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -224,7 +224,14 @@ module.exports = {
 		"one-var": "off",
 		"one-var-declaration-per-line": "error",
 		"operator-assignment": "off",
-		"operator-linebreak": "warn",
+		"operator-linebreak": ["error", "after", {
+			"overrides": {
+				"?": "before",
+				":": "before",
+				"||": "before",
+				"&&": "before",
+			},
+		}],
 		"padded-blocks": "off",
 		"padding-line-between-statements": "error",
 		"prefer-arrow-callback": "warn",
diff --git a/packages/lib/config/definitions.js b/packages/lib/config/definitions.js
index 7958db7e..27edcbe7 100644
--- a/packages/lib/config/definitions.js
+++ b/packages/lib/config/definitions.js
@@ -69,9 +69,9 @@ MasterGroup.define({
 	name: "auth_secret",
 	title: "Master Authentication Secret",
 	description:
-		"Secret used to generate and verify authentication tokens."
-		+"  Should be a long string of random letters and numbers."
-		+"  Do not share this.",
+		"Secret used to generate and verify authentication tokens.  " +
+		"Should be a long string of random letters and numbers.  " +
+		"Do not share this.",
 	type: "string",
 	optional: true,
 });
diff --git a/test/slave.js b/test/slave.js
index b7b12ee9..a14c40f1 100644
--- a/test/slave.js
+++ b/test/slave.js
@@ -67,19 +67,13 @@ describe("Slave testing", function() {
 
 		it("should throw on CON, PRN, AUX, NUL, COM1, LPT1", function() {
 			for (let bad of ["CON", "PRN", "AUX", "NUL", "COM1", "LPT1"]) {
-				check(
-					bad, "cannot be named any of . .."
-					+" CON PRN AUX NUL COM1-9 and LPT1-9"
-				);
+				check(bad, "cannot be named any of . .. CON PRN AUX NUL COM1-9 and LPT1-9");
 			}
 		});
 
 		it("should throw on . and ..", function() {
 			for (let bad of [".", ".."]) {
-				check(
-					bad, "cannot be named any of . .."
-					+" CON PRN AUX NUL COM1-9 and LPT1-9"
-				);
+				check(bad, "cannot be named any of . .. CON PRN AUX NUL COM1-9 and LPT1-9");
 			}
 		});