diff --git a/EduNetworkBuilder/NetTestEditor.cs b/EduNetworkBuilder/NetTestEditor.cs
index ad2ffc3..9777791 100644
--- a/EduNetworkBuilder/NetTestEditor.cs
+++ b/EduNetworkBuilder/NetTestEditor.cs
@@ -226,7 +226,8 @@ namespace EduNetworkBuilder
                 {
                     cbDest.Items.Add(NB.Translate("_All"));
                 }
-                else if (ToEdit.TheTest == NetTestType.DeviceIsFrozen)
+                else if (ToEdit.TheTest == NetTestType.DeviceIsFrozen || ToEdit.TheTest == NetTestType.DeviceBlowsUpWithPower 
+                    || ToEdit.TheTest == NetTestType.DeviceNeedsUPS)
                 {
                     cbDest.Items.Add(ToEdit.sHost);
                 }
diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index b79d4b7..39c3976 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -1084,7 +1084,7 @@ namespace EduNetworkBuilder
                     myNet.Invalidate(Location);
                 }
                 Image tImage = MyImage;
-                if (MorphColor != Color.Empty || PowerOff == false)
+                if (MorphColor != Color.Empty || PowerOff == true)
                     tImage = ColoredImage(MyImage);
                 if (IsBurned)
                     tImage = BurnedImage(tImage);