diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index c1e78f473..c6ad57c70 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -66,7 +66,7 @@ z3_add_component(api
     z3_replayer.cpp
     ${full_path_generated_files}
   COMPONENT_DEPENDENCIES
-    opt
+    z3_opt
     euf
     portfolio
     realclosure
diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h
index f66bd1f76..9e8cc6796 100644
--- a/src/api/c++/z3++.h
+++ b/src/api/c++/z3++.h
@@ -4925,7 +4925,7 @@ namespace z3 {
         
         void check_context(rcf_num const& other) const {
             if (m_ctx != other.m_ctx) {
-                throw exception("rcf_num objects from different contexts");
+                Z3_THROW(exception("rcf_num objects from different contexts"));
             }
         }
         
@@ -5105,9 +5105,9 @@ namespace z3 {
     */
     inline std::vector<rcf_num> rcf_roots(context& c, std::vector<rcf_num> const& coeffs) {
         if (coeffs.empty()) {
-            throw exception("polynomial coefficients cannot be empty");
+            Z3_THROW(exception("polynomial coefficients cannot be empty"));
         }
-        
+
         unsigned n = static_cast<unsigned>(coeffs.size());
         std::vector<Z3_rcf_num> a(n);
         std::vector<Z3_rcf_num> roots(n);
diff --git a/src/opt/CMakeLists.txt b/src/opt/CMakeLists.txt
index 21075d88c..85b716306 100644
--- a/src/opt/CMakeLists.txt
+++ b/src/opt/CMakeLists.txt
@@ -1,4 +1,4 @@
-z3_add_component(opt
+z3_add_component(z3_opt
   SOURCES
     maxcore.cpp
     maxlex.cpp
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index c0e9c8505..22c071966 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -8,7 +8,7 @@ set (shell_object_files "")
 
 # We are only using these dependencies to enforce a build
 # order. We don't use this list for actual linking.
-set(shell_deps api extra_cmds opt sat)
+set(shell_deps api extra_cmds z3_opt sat)
 z3_expand_dependencies(shell_expanded_deps ${shell_deps})
 get_property(Z3_LIBZ3_COMPONENTS_LIST GLOBAL PROPERTY Z3_LIBZ3_COMPONENTS)
 foreach (component ${Z3_LIBZ3_COMPONENTS_LIST})