diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm
index c9973659664..936e1c5db72 100644
--- a/code/game/gamemodes/nations/nations.dm
+++ b/code/game/gamemodes/nations/nations.dm
@@ -117,9 +117,11 @@ datum/game_mode/nations
 		AI.add_inherent_law("Remain available to mediate all conflicts between the various nations when asked to.")
 		AI.show_laws()
 		for(var/mob/living/silicon/robot/R in AI.connected_robots)
+			var/obj/item/device/mmi/oldmmi = R.mmi
 			R.change_mob_type(/mob/living/silicon/robot/peacekeeper, null, null, 1, 1 )
 			R.lawsync()
 			R.show_laws()
+			qdel(oldmmi)
 
 /**
  * LateSpawn hook.
@@ -203,6 +205,10 @@ datum/game_mode/nations
 			H << "You do not belong to any nation and are free to sell your services to the highest bidder."
 			return 1
 
+		if(H.mind.assigned_role == "AI")
+			mode.set_ai()
+			return 1
+
 		else
 			message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!")
 			return 1
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 9c1d8b79f92..083b3cd8d3b 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -13,11 +13,11 @@
 	if(!O)
 		return 0
 
-	O.mouse_opacity = 2	
+	O.mouse_opacity = 2
 	if(istype(O,/obj/item/borg/sight))
 		var/obj/item/borg/sight/S = O
 		sight_mode &= ~S.sight_mode
-		
+
 	if(client)
 		client.screen -= O
 	contents -= O
@@ -71,6 +71,7 @@
 			sight_mode |= module_state_3:sight_mode
 	else
 		src << "You need to disable a module first!"
+	src.update_icons()
 
 /mob/living/silicon/robot/proc/uneq_active()
 	uneq_module(module_active)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index a2f83fc218e..f9fa6c3c996 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1008,16 +1008,16 @@ var/list/robot_verbs_default = list(
 		else
 			overlays += "ov-openpanel -c"
 
-	if(modtype == ("Combat" || "Peacekeeper"))
+	var/combat = list("Combat","Peacekeeper")
+	if(modtype in combat)
 		if (base_icon == "")
 			base_icon = icon_state
 		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
 			icon_state = "[base_icon]-roll"
 		else
 			icon_state = base_icon
-
-	if(activated(/obj/item/borg/combat/shield))
-		overlays += "[icon_state]-shield"
+		if(activated(/obj/item/borg/combat/shield))
+			overlays += "[base_icon]-shield"
 
 	if(jetpackoverlay)
 		overlays += "minerjetpack-[icon_state]"