diff --git a/src/XDEDRAW/XDEDRAW_Common.cxx b/src/XDEDRAW/XDEDRAW_Common.cxx
index 585f64e0e5..b22973baa3 100644
--- a/src/XDEDRAW/XDEDRAW_Common.cxx
+++ b/src/XDEDRAW/XDEDRAW_Common.cxx
@@ -214,8 +214,7 @@ static Standard_Integer FromShape(Draw_Interpretor& theDI,
   for (XSControl_WorkSessionMap::Iterator DicIt(DictWS);
        DicIt.More(); DicIt.Next())
   {
-    Handle(XSControl_WorkSession) CurrentWS =
-      Handle(XSControl_WorkSession)::DownCast(DicIt.Value());
+    Handle(XSControl_WorkSession) CurrentWS = DicIt.Value();
     XSDRAW::Pilot()->SetSession(CurrentWS);
     theDI.Eval(command);
   }
diff --git a/src/XSControl/XSControl.cxx b/src/XSControl/XSControl.cxx
index 779d7e40b3..8395775e42 100644
--- a/src/XSControl/XSControl.cxx
+++ b/src/XSControl/XSControl.cxx
@@ -25,7 +25,7 @@ Handle(XSControl_WorkSession)  XSControl::Session
     Handle(XSControl_Vars)  XSControl::Vars
   (const Handle(IFSelect_SessionPilot)& pilot)
 {
-  Handle(XSControl_Vars) avars;
+  Handle(XSControl_Vars) avars = new XSControl_Vars;;
   Handle(XSControl_WorkSession) WS = XSControl::Session(pilot);
   //if (!WS.IsNull()) avars = WS->Vars();
   return avars;