diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua
index a7d76af26..c9a78cf6b 100644
--- a/Moose Development/Moose/Functional/RAT.lua	
+++ b/Moose Development/Moose/Functional/RAT.lua	
@@ -1260,7 +1260,7 @@ function RAT:_SetRoute(takeoff, _departure, _destination)
   local d_holding=Pholding:Get2DDistance(Pdestination)
   
   -- Height difference between departure and holding point.
-  local deltaH=h_holding+H_holding-H_departure
+  local deltaH=math.abs(h_holding+H_holding-H_departure)
   
   -- GENERAL
   -- Heading from departure to holding point of destination.
@@ -2239,17 +2239,22 @@ function RAT:_Waypoint(Type, Coord, Speed, Altitude, Airport)
   -- waypoint name (only for the mission editor)
   RoutePoint.name="RAT waypoint"
   
-  if Airport and not Type==RAT.wp.air then
+  if (Airport~=nil) and Type~=RAT.wp.air then
     local AirbaseID = Airport:GetID()
     local AirbaseCategory = Airport:GetDesc().category
     if AirbaseCategory == Airbase.Category.SHIP then
       RoutePoint.linkUnit = AirbaseID
       RoutePoint.helipadId = AirbaseID
+      env.info(RAT.id.."WP: Ship id = "..AirbaseID)
     elseif AirbaseCategory == Airbase.Category.HELIPAD then
       RoutePoint.linkUnit = AirbaseID
       RoutePoint.helipadId = AirbaseID
+      env.info(RAT.id.."WP: Helipad id = "..AirbaseID)
     elseif AirbaseCategory == Airbase.Category.AIRDROME then
       RoutePoint.airdromeId = AirbaseID
+      env.info(RAT.id.."WP: Airdrome id = "..AirbaseID)
+    else
+      env.error(RAT.id.."Unknown Airport categoryin _Waypoint()!")
     end  
   end
 --  if _AID then
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 314c98d50..37289ba7a 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
-env.info( 'Moose Generation Timestamp: 20170909_1801' )
+env.info( 'Moose Generation Timestamp: 20170915_1652' )
 
 local base = _G