diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 07489d6323774f5ba6e8f15a04b545da55923522..7721bf3779294e24ce16844e827d43c56af4292c 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -232,16 +232,16 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
 			slave.brand["right buttock"] = slave.brand.buttocks;
 			delete slave.brand.buttocks;
 		}
-		if (slave.brand.calves) {
-			slave.brand["left calf"] = slave.brand.calves;
-			slave.brand["right calf"] = slave.brand.calves;
-			delete slave.brand.calves;
-		}
 		if (slave.brand.thighs) {
 			slave.brand["left thigh"] = slave.brand.thighs;
 			slave.brand["right thigh"] = slave.brand.thighs;
 			delete slave.brand.thigh;
 		}
+		if (slave.brand.calves) {
+			slave.brand["left calf"] = slave.brand.calves;
+			slave.brand["right calf"] = slave.brand.calves;
+			delete slave.brand.calves;
+		}
 		if (slave.brand.ankles) {
 			slave.brand["left ankle"] = slave.brand.ankles;
 			slave.brand["right ankle"] = slave.brand.ankles;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 94de5d816e1f910e6ff92008ad3957c8250652eb..4a020dd7464cec80229f559a4e94e2ff4904e5db 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2976,6 +2976,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			super("Your preferred location for brands is", []);
 
+			// Sorted from top of body down, to make sure list is same as elsewhere.
+
 			// Head
 			const cheeks = new ListSubSection(this, "Cheeks", [
 				["Left", "left cheek"],
@@ -2989,6 +2991,13 @@ window.rulesAssistantOptions = (function() {
 			]);
 			this.appendChild(ears);
 
+			// Torso
+			const breasts = new ListSubSection(this, "Breasts", [
+				["Left", "left breast"],
+				["Right", "right breast"]
+			]);
+			this.appendChild(breasts);
+
 			// Arms
 			const shoulders = new ListSubSection(this, "Shoulders", [
 				["Left", "left shoulder"],
@@ -3020,13 +3029,6 @@ window.rulesAssistantOptions = (function() {
 			]);
 			this.appendChild(hand);
 
-			// Torso
-			const breasts = new ListSubSection(this, "Breasts", [
-				["Left", "left breast"],
-				["Right", "right breast"]
-			]);
-			this.appendChild(breasts);
-
 			// Legs
 			const buttocks = new ListSubSection(this, "Buttocks", [
 				["Left", "left buttock"],
@@ -3067,6 +3069,9 @@ window.rulesAssistantOptions = (function() {
 				["Back", "back"],
 				["Lower Back", "lower back"]
 			]);
+
+			// Ignoring testicles and penis for now, as not all slaves have them.
+
 			this.appendChild(other);
 
 			this.setValue(V.brandTarget.RA);
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index fabd15cb4c594a72c707a0508c334d7bcc006041..9af56a717af76e219cbb1117fdb50a1a739b2bb5 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1034,7 +1034,7 @@ Choose a site for branding:
 Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modification">>
 
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
-<<if ["ear", "cheek", "shoulder", "breast", "upper arm", "lower arm", "wrist", "hand", "buttock", "thigh", "calf", "ankle", "foot", "testicle"].includes($brandTarget.local)>>
+<<if ["ear", "cheek", "breast", "shoulder", "upper arm", "lower arm", "wrist", "hand", "buttock", "thigh", "calf", "ankle", "foot", "testicle"].includes($brandTarget.local)>>
 	Brand $him now with ''$brandDesign.local'' on the
 	<<link "left">>
 		<<set $brandApplied = 1>>