diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt
index 2c0c7605c..4a73c259f 100755
--- a/src/GEOM/CMakeLists.txt
+++ b/src/GEOM/CMakeLists.txt
@@ -39,6 +39,7 @@ SET(_link_LIBRARIES
   ${CAS_TKLCAF}
   ${CAS_TKCDF}
   ${CAS_TKG3d}
+  ${CAS_TKStdL}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
   GEOMSketcher
diff --git a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx
index 952c54bd2..7070c2259 100755
--- a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx
+++ b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx
@@ -273,7 +273,7 @@ bool MeasureGUI_AnnotationInteractor::eventFilter( QObject* theObject, QEvent* t
       {
         const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-        if ( anAISContext->IsHilighted( myActiveIO ) )
+        if ( anAISContext->IsHilighted( Handle(AIS_InteractiveObject)::DownCast( myActiveIO ) ) )
         {
           anAISContext->Unhilight( myActiveIO, Standard_False );
         }
diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 2bc3e3f81..4674ac750 100755
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -48,6 +48,7 @@ SET(_link_LIBRARIES
   OCC2VTK
   SalomeIDLGEOM
   ${CAS_TKBRep}
+  ${CAS_TKOpenGl}
   ${KERNEL_SALOMELocalTrace}
   ${GUI_SalomeObject}
   ${GUI_SVTK}