diff --git a/Moose/Mission.lua b/Moose/Mission.lua
index 2ff9c8485..1d65c5e0c 100644
--- a/Moose/Mission.lua
+++ b/Moose/Mission.lua
@@ -175,12 +175,12 @@ trace.f(self.ClassName)
 	local AlivePlayers = ''
 	for ClientID, Client in pairs( self._Clients ) do
 		if  Client:ClientGroup() then
-			if Client:ClientGroup():getUnit(1) then
-				if Client:ClientGroup():getUnit(1):getLife() > 0.0 then
+			if Client:ClientGroupUnit() then
+				if Client:ClientGroupUnit():getLife() > 0.0 then
 					if AlivePlayers == '' then
-						AlivePlayers = ' Players: ' .. Client:ClientGroup():getUnit(1):getPlayerName()
+						AlivePlayers = ' Players: ' .. Client:ClientGroupUnit():getPlayerName()
 					else
-						AlivePlayers = AlivePlayers .. ' / ' .. Client:ClientGroup():getUnit(1):getPlayerName()
+						AlivePlayers = AlivePlayers .. ' / ' .. Client:ClientGroupUnit():getPlayerName()
 					end
 				end
 			end
@@ -505,7 +505,7 @@ trace.scheduled("MISSIONSCHEDULER","Scheduler")
 								if Mission.GoalFunction ~= nil then
 									Mission.GoalFunction( Mission, Client )
 								end
-								_Database:_AddMissionTaskScore( Client:ClientGroup():getUnit(1), Mission.Name, 25 )
+								_Database:_AddMissionTaskScore( Client:ClientGroupUnit(), Mission.Name, 25 )
 
 --								if not Mission:IsCompleted() then
 --								end
diff --git a/Moose/Stage.lua b/Moose/Stage.lua
index 7dfc90f99..c607a6642 100644
--- a/Moose/Stage.lua
+++ b/Moose/Stage.lua
@@ -233,7 +233,7 @@ trace.f(self.ClassName)
 
 	local RouteMessage = "Fly to "
 	for LandingZoneID, LandingZoneName in pairs( Task.LandingZones.LandingZoneNames ) do
-		RouteMessage = RouteMessage .. LandingZoneName .. ' at ' .. routines.getBRStringZone( { zone = LandingZoneName, ref = Client:ClientGroup():getUnit(1):getPoint(), true, true } ) .. ' km. '
+		RouteMessage = RouteMessage .. LandingZoneName .. ' at ' .. routines.getBRStringZone( { zone = LandingZoneName, ref = Client:ClientGroupUnit():getPoint(), true, true } ) .. ' km. '
 	end
 	Client:Message( RouteMessage, self.MSG.TIME, Mission.Name .. "/StageRoute", "Co-Pilot: Route", 20 )