diff --git a/src/js/modification.js b/src/js/modification.js
index 9d54512583393c773e36d6177f544906fcd4bd51..8670dd6176a3191b13647b98a94e354d219bddcb 100644
--- a/src/js/modification.js
+++ b/src/js/modification.js
@@ -388,7 +388,7 @@ App.Medicine.Modification.setTattoo = function(slave, location, design) {
 						break;
 					case "rude words":
 						r += `$He stares, $his mouth working as $he spells out `;
-						if ($activeSlave.vagina > -1) {
+						if (slave.vagina > -1) {
 							r += `'Fucktoy's Favorite Fuckhole.' ${He} smiles naughtily. "${Master}, it sure i${s}, `;
 						} else {
 							r += `'Sissy Slut's Sodomy Slit.' ${He} smiles naughtily. "${Master}, I love it when you fuck my lewd butt ${s}lit," `;
@@ -520,7 +520,7 @@ App.Medicine.Modification.setTattoo = function(slave, location, design) {
 						break;
 					case "advertisements":
 						r += `${He} stares, ${his} mouth working as ${he} spells out `;
-						if ($activeSlave.vagina > -1) {
+						if (slave.vagina > -1) {
 							r += `'Second Pussy.' ${His} face darkens. "No it'${s} not," ${he} bursts out. "Anal is dirty."`;
 						} else {
 							r += `'Spit First.' ${His} face darkens. "Gro${ss}," ${he} bursts out. "Gro${ss} and wrong!"`;
@@ -528,7 +528,7 @@ App.Medicine.Modification.setTattoo = function(slave, location, design) {
 						break;
 					case "rude words":
 						r += `${He} stares, ${his} mouth working as ${he} spells out `;
-						if ($activeSlave.vagina > -1) {
+						if (slave.vagina > -1) {
 							r += `'Fucktoy's Favorite Fuckhole.' ${His} face darkens. "No it'${s} not," ${he} bursts out. "It'${s} my a${ss}!"`;
 						} else {
 							r += `'Sissy Slut's Sodomy Slit.' ${His} face darkens. "No it'${s} not," ${he} bursts out. "I'm not a ${s}i${ss}y! Or a ${s}lut! And it'${s} not a ${s}lit!" Those are debatable, but they can all change, of course.`;
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 73c92ecdaecf635ae09f13ee26aa519a375c619b..a949912d9a7c4759ee4a87aba2aaa7df4c9df908 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -935,9 +935,8 @@ App.UI.SlaveList.penthousePage = function() {
 	 * @returns {string}
 	 */
 	function encycTips(jn) {
-		let r =``;
+		let r =`<span class="note">`;
 		if (V.showTipsFromEncy) {
-			r += `<span class="note">`;
 			switch (jn) {
 				case "rest":
 					r += `<<encyclopediaEntryRest>>`;
@@ -975,9 +974,8 @@ App.UI.SlaveList.penthousePage = function() {
 					r += `missing tip for this tab`;
 					break;
 			}
-			r += `</span>`;
 		}
-		return r;
+		return r += `</span>`;
 	}
 
 	let r = '';