diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm
index 2883ae0a50a..465f9b0489b 100644
--- a/code/game/gamemodes/wizard/godhand.dm
+++ b/code/game/gamemodes/wizard/godhand.dm
@@ -29,7 +29,13 @@
 /obj/item/weapon/melee/touch_attack/afterattack(atom/target, mob/user, proximity)
 	user.say(catchphrase)
 	playsound(get_turf(user), on_use_sound,50,1)
-	attached_spell.attached_hand = null
+	if(attached_spell)
+		attached_spell.attached_hand = null
+	qdel(src)
+
+/obj/item/weapon/melee/touch_attack/dropped()
+	if(attached_spell)
+		attached_spell.attached_hand = null
 	qdel(src)
 
 /obj/item/weapon/melee/touch_attack/disintegrate
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 27d46c1b551..b1b3d9994bf 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -164,6 +164,8 @@
 
 			H.real_name = newname
 			H.name = newname
+			if(H.dna)
+				H.dna.real_name = newname
 			if(H.mind)
 				H.mind.name = newname
 
diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm
index 5a33a43586b..076c8821bf6 100644
--- a/code/modules/events/wizard/rpgloot.dm
+++ b/code/modules/events/wizard/rpgloot.dm
@@ -25,8 +25,8 @@
 
 		I.force 		= max(0,I.force + quality)
 		I.throwforce	= max(0,I.throwforce + quality)
-		for(var/armor_value in I.armor)
-			armor_value	+= quality
+		for(var/value in I.armor)
+			I.armor[value] += quality
 
 		if(istype(I,/obj/item/weapon/storage))
 			var/obj/item/weapon/storage/S = I
@@ -56,7 +56,7 @@
 		return
 	target.force 		+= 1
 	target.throwforce	+= 1
-	for(var/armor_value in target.armor)
-		armor_value	+= 1
+	for(var/value in target.armor)
+		target.armor[value] += 1
 	user << "<span class='notice'>[target] glows blue and seems vaguely \"better\"!</span>"
-	qdel(src)
\ No newline at end of file
+	qdel(src)