diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua
index 496e7cef1..0fc411ebd 100644
--- a/Moose Development/Moose/Wrapper/Unit.lua	
+++ b/Moose Development/Moose/Wrapper/Unit.lua	
@@ -20,8 +20,8 @@
 -- @module Wrapper.Unit
 -- @image Wrapper_Unit.JPG
 
-
---- @type UNIT
+---
+-- @type UNIT
 -- @field #string ClassName Name of the class.
 -- @field #string UnitName Name of the unit.
 -- @field #string GroupName Name of the group the unit belongs to.
@@ -179,9 +179,9 @@ function UNIT:GetDCSObject()
     return DCSUnit
   end
   
-  if self.DCSUnit then
-    return self.DCSUnit
-  end
+  --if self.DCSUnit then
+    --return self.DCSUnit
+  --end
   
   return nil
 end
@@ -561,7 +561,7 @@ end
 
 --- Check if the unit is a tanker. Also retrieves the refuelling system (boom or probe) if applicable.
 -- @param #UNIT self
--- @return #boolean If true, unit is refuelable (checks for the attribute "Refuelable").
+-- @return #boolean If true, unit is a tanker (checks for the attribute "Tankers").
 -- @return #number Refueling system (if any): 0=boom, 1=probe.
 function UNIT:IsTanker()
   self:F2( self.UnitName )
@@ -582,7 +582,7 @@ function UNIT:IsTanker()
     -- Some hard coded data as this is not in the descriptors...
     if typename=="IL-78M" then
       system=1 --probe
-    elseif typename=="KC130" then
+    elseif typename=="KC130" or typename=="KC130J" then
       system=1 --probe
     elseif typename=="KC135BDA" then
       system=1 --probe
@@ -590,6 +590,10 @@ function UNIT:IsTanker()
       system=1 --probe
     elseif typename=="S-3B Tanker" then
       system=1 --probe
+    elseif typename=="KC_10_Extender" then
+      system=1 --probe
+    elseif typename=="KC_10_Extender_D" then
+      system=0 --boom
     end
     
   end