diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index 8c1597d8..5bc4dd30 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -2213,8 +2213,6 @@
 			<test value="/systems/electrical/bus/dc-2">
 				/systems/electrical/bus/dc-2 ge 25
 			</test>
-			<!--<output>/systems/electrical/outputs/adf</output>
-			<output>/systems/electrical/outputs/dme</output>-->
 			<output>/systems/electrical/outputs/efis</output>
 			<output>/systems/electrical/outputs/fcp-power</output>
 			<output>/systems/electrical/outputs/fuel-pump[0]</output>
@@ -2222,13 +2220,31 @@
 			<output>/systems/electrical/outputs/fuel-pump[2]</output>
 			<output>/systems/electrical/outputs/gps</output>
 			<output>/systems/electrical/outputs/mk-viii</output>
-			<!--<output>/systems/electrical/outputs/nav[0]</output>
-			<output>/systems/electrical/outputs/nav[1]</output>
-			<output>/systems/electrical/outputs/nav[2]</output>
-			<output>/systems/electrical/outputs/nav[3]</output>-->
 			<output>/systems/electrical/outputs/tacan</output>
 			<output>/systems/electrical/outputs/turn-coordinator</output>
 		</switch>
+		
+		<switch name="/instrumentation/comm[0]/power-btn">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/bus/dc-ess ge 25
+			</test>
+		</switch>
+		
+		<switch name="/instrumentation/comm[1]/power-btn">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/bus/dc-2 ge 25
+			</test>
+		</switch>
+		
+		<switch name="/instrumentation/comm[2]/power-btn">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/bus/dc-1 ge 25
+			</test>
+		</switch>
+		
 	</channel>
 	
 	<channel name="Overhead Lights" execrate="8">
diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml
index f8910b0f..b18758d3 100644
--- a/Systems/instrumentation.xml
+++ b/Systems/instrumentation.xml
@@ -140,7 +140,7 @@
 	<dme> <!-- fake extra dme units for the ILS -->
 		<name>dme</name>
 		<number>2</number>
-		<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</dme>
 	
@@ -178,19 +178,14 @@
 	<marker-beacon> <!-- part of VOR1 unit -->
 		<name>marker-beacon</name>
 		<number>0</number>
-		<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</marker-beacon>
 	
-	<marker-beacon>
-		<name>marker-beacon</name>
-		<number>0</number>
-	</marker-beacon>
-	
 	<nav-radio> <!-- VOR unit -->
 		<name>nav</name>
 		<number>0</number>
-		<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</nav-radio>
 	
@@ -204,7 +199,7 @@
 	<nav-radio> <!-- ILS unit -->
 		<name>nav</name>
 		<number>2</number>
-		<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</nav-radio>