diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63ba0b34f..0ab71979b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,6 @@ MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \
 
 # Find KERNEL
 # ===========
-
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
@@ -101,7 +100,6 @@ IF (NOT DEFINED EMSCRIPTEN)
   FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   FIND_PACKAGE(SalomeSWIG REQUIRED)
 ELSE()
-  LIST(TRANSFORM OMNIORB_LIBRARIES REPLACE "\.so$" "\.a")
   FIND_PACKAGE(SalomePythonWasm REQUIRED)
   SET(PYTHON_INCLUDE_DIRS ${PYTHONWASM_INCLUDE_DIR})
   SET(PYTHON_LIBRARIES ${PYTHONWASM_LIB})
diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
index 9704ea010..50a050791 100644
--- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
@@ -1059,7 +1059,7 @@ Standard_Integer GEOMAlgo_AlgoTools::PointCloudInFace(const TopoDS_Face& theFace
                                                       const int          theNbPnts,
                                                       TopoDS_Compound&   theCompound)
 {
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   return -1;
 #else
   ShapeUpgrade_ShapeDivideArea tool (theFace);
@@ -1568,7 +1568,7 @@ void ModifyFacesForGlobalResult(const TopoDS_Face&     theInputFace,
     Standard_Integer aNbFacesInLocalResult;
     if (aNumberToSplit > 1)
     {
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
       aNbFacesInLocalResult = 0;
 #else
       ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape);
@@ -1648,7 +1648,7 @@ void ModifyFacesForGlobalResult(const TopoDS_Face&     theInputFace,
     Standard_Integer aNumberToSplit = (theIsToAddFaces)? aMaxNbFaces + (aDiff-aSum) : aMaxNbFaces - (aDiff-aSum);
     if (aNumberToSplit > 1)
     {
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
       aNumberToSplit = 1;
 #else
       ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape);
diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt
index ffe0bb80a..f0ef9737b 100644
--- a/src/GEOMImpl/CMakeLists.txt
+++ b/src/GEOMImpl/CMakeLists.txt
@@ -20,7 +20,6 @@
 # --- options ---
 
 # additional include directories
-
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
diff --git a/src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx b/src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx
index 17dc33622..d2585b0ad 100644
--- a/src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx
@@ -28,7 +28,7 @@
 #include "GEOM_Object.hxx"
 #include "GEOM_PythonDump.hxx"
 
-#if 0
+#if OCC_VERSION_LARGE > 0x07050303 && !defined(__EMSCRIPTEN__)
 #include <ShapeAnalysis_CanonicalRecognition.hxx>
 #endif
 
@@ -77,7 +77,7 @@ bool GEOMImpl_ICanonicalRecognition::isPlane(const Handle(GEOM_Object)& theShape
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -106,7 +106,7 @@ bool GEOMImpl_ICanonicalRecognition::isSphere(const Handle(GEOM_Object)& theShap
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -135,7 +135,7 @@ bool GEOMImpl_ICanonicalRecognition::isCone(const Handle(GEOM_Object)& theShape,
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -164,7 +164,7 @@ bool GEOMImpl_ICanonicalRecognition::isCylinder(const Handle(GEOM_Object)& theSh
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -193,7 +193,7 @@ bool GEOMImpl_ICanonicalRecognition::isLine(const Handle(GEOM_Object)& theEdge,
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -222,7 +222,7 @@ bool GEOMImpl_ICanonicalRecognition::isCircle(const Handle(GEOM_Object)& theEdge
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
@@ -251,7 +251,7 @@ bool GEOMImpl_ICanonicalRecognition::isEllipse(const Handle(GEOM_Object)& theEdg
     return false;
   }
 
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
   SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
   return false;
 #else
diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
index e54bccc4f..779cbb296 100644
--- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
@@ -319,7 +319,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) c
     }
     else
     {
-#if 1
+#if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
       Standard_NotImplemented::Raise("Point cloud creation aborted. Improper OCCT version: please, use OCCT 7.5.3p4 or newer.");
 #else
       if (GEOMAlgo_AlgoTools::PointCloudInFace(F, aNbPnts, aCompound) < 0)
diff --git a/src/GEOM_I_Superv/CMakeLists.txt b/src/GEOM_I_Superv/CMakeLists.txt
index d599be543..079d0a7e2 100644
--- a/src/GEOM_I_Superv/CMakeLists.txt
+++ b/src/GEOM_I_Superv/CMakeLists.txt
@@ -73,5 +73,3 @@ SET(GEOM_SupervEngine_SOURCES
 ADD_LIBRARY(GEOM_SupervEngine ${GEOM_SupervEngine_SOURCES})
 TARGET_LINK_LIBRARIES(GEOM_SupervEngine ${_link_LIBRARIES})
 INSTALL(TARGETS GEOM_SupervEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
-
-INSTALL(FILES ${GEOM_SupervEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
diff --git a/src/GEOM_SWIG/CMakeLists.txt b/src/GEOM_SWIG/CMakeLists.txt
index 59fda0da7..e0d4ae9bb 100644
--- a/src/GEOM_SWIG/CMakeLists.txt
+++ b/src/GEOM_SWIG/CMakeLists.txt
@@ -139,7 +139,7 @@ SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA} DEF_PER
 SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED} DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom DEF_PERMS)
 
-# # Install plugin scripts
+# Install plugin scripts
 SALOME_INSTALL_SCRIPTS("${_python_advanced_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/AdvancedGEOM DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${_python_STL_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STLPlugin DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${_python_BREP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/BREPPlugin DEF_PERMS)