diff --git a/Aircraft/Instruments/egt-ff-c172s.xml b/Aircraft/Instruments/egt-ff-c172s.xml
index e444e0124..a12af0a7e 100644
--- a/Aircraft/Instruments/egt-ff-c172s.xml
+++ b/Aircraft/Instruments/egt-ff-c172s.xml
@@ -61,10 +61,10 @@ Jan 26 2003
      </condition>
      <type>rotation</type>
      <property alias="../../../../../params/engine-egt-select"/>
-     <min>350</min>
-     <max>800</max>
-     <scale>-0.268</scale>
-     <offset>148.1</offset>
+     <min>0</min>
+     <max>600</max>
+     <scale>-0.4</scale>
+     <offset>55</offset>
     </transformation>
     <transformation>
      <condition>
diff --git a/Aircraft/Instruments/hsi-bk-hi.xml b/Aircraft/Instruments/hsi-bk-hi.xml
index 301428977..81283952e 100644
--- a/Aircraft/Instruments/hsi-bk-hi.xml
+++ b/Aircraft/Instruments/hsi-bk-hi.xml
@@ -24,11 +24,9 @@ Mar 18 2003
   <to-flag>/radios/nav[0]/to-flag</to-flag>
   <from-flag>/radios/nav[0]/from-flag</from-flag>
   <vor-in-range>/radios/nav[0]/in-range</vor-in-range>
-  <!-- when posible change to nav-gs-in-range -->
-  <gs-in-range>/radios/nav[0]/in-range</gs-in-range>
+  <has-gs>/radios/nav[0]/has-gs</has-gs>
   <heading-deg>/orientation/heading-magnetic-deg</heading-deg>
   <autopilot-heading-deg>/autopilot/settings/heading-bug-deg</autopilot-heading-deg>
-  <autopilot-heading-lock>/autopilot/locks/heading</autopilot-heading-lock>
  </params>
  
  <layers>
@@ -405,7 +403,7 @@ Mar 18 2003
    <name>GS needle right</name>
    <condition>
     <equals>
-     <property alias="../../../../../params/gs-in-range"/>
+     <property alias="../../../../../params/has-gs"/>
      <value>true</value>
     </equals>
    </condition>
@@ -438,7 +436,7 @@ Mar 18 2003
    <name>GS needle left</name>
    <condition>
     <equals>
-     <property alias="../../../../../params/gs-in-range"/>
+     <property alias="../../../../../params/has-gs"/>
      <value>true</value>
     </equals>
    </condition>
@@ -505,7 +503,7 @@ Mar 18 2003
    <name>HDG OFF</name>
    <condition>
     <equals>
-     <property alias="../../../../../params/autopilot-heading-lock"/>
+     <property>/systems/electrical/outputs/hsi</property>
      <value>false</value>
     </equals>
    </condition>