diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 903647308..ee5791526 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -32,9 +32,9 @@ jobs:
       strategy:
         matrix:
           os:
-            - ubuntu-24.04
-            - macos-14
-            - macos-12
+            # - ubuntu-24.04
+            # - macos-14
+            # - macos-12
             - windows-2019
       runs-on: ${{ matrix.os }}
       steps:
diff --git a/cpp/csp/adapters/kafka/KafkaAdapterManager.h b/cpp/csp/adapters/kafka/KafkaAdapterManager.h
index f6b7f03c9..925062422 100644
--- a/cpp/csp/adapters/kafka/KafkaAdapterManager.h
+++ b/cpp/csp/adapters/kafka/KafkaAdapterManager.h
@@ -49,7 +49,7 @@ struct KafkaStatusMessageTypeTraits
 using KafkaStatusMessageType = csp::Enum<KafkaStatusMessageTypeTraits>;
 
 //Top level AdapterManager object for all kafka adapters in the engine
-class CSPKAFKAADAPTERIMPL_EXPORT KafkaAdapterManager final : public csp::AdapterManager
+class CSP_PUBLIC KafkaAdapterManager final : public csp::AdapterManager
 {
 public:
     KafkaAdapterManager( csp::Engine * engine, const Dictionary & properties );
diff --git a/cpp/csp/core/Exception.h b/cpp/csp/core/Exception.h
index 95b32945a..5227acf34 100644
--- a/cpp/csp/core/Exception.h
+++ b/cpp/csp/core/Exception.h
@@ -10,7 +10,7 @@
 namespace csp
 {
 
-class CSPCORE_EXPORT Exception : public std::exception
+class CSP_PUBLIC Exception : public std::exception
 {
 public:
     Exception( const char * exType, const std::string & description, const char * file, const char * func, int line ) :
diff --git a/cpp/csp/engine/CMakeLists.txt b/cpp/csp/engine/CMakeLists.txt
index ad88a9845..61a3a05b4 100644
--- a/cpp/csp/engine/CMakeLists.txt
+++ b/cpp/csp/engine/CMakeLists.txt
@@ -87,8 +87,9 @@ generate_export_header(csp_types
         EXPORT_MACRO_NAME CSPTYPES_EXPORT
 )
 set_target_properties(csp_types PROPERTIES PUBLIC_HEADER "${CSP_TYPES_PUBLIC_HEADERS}")
+target_link_libraries(csp_types csp_core)
 
-add_library(csp_engine STATIC ${ENGINE_SOURCE_FILES})
+add_library(csp_engine SHARED ${ENGINE_SOURCE_FILES})
 generate_export_header(csp_engine
         BASE_NAME cspengine
         EXPORT_MACRO_NAME CSPENGINE_EXPORT
diff --git a/cpp/csp/engine/TimeSeries.h b/cpp/csp/engine/TimeSeries.h
index d99c26625..dcc235d3d 100644
--- a/cpp/csp/engine/TimeSeries.h
+++ b/cpp/csp/engine/TimeSeries.h
@@ -60,7 +60,7 @@ class CSPENGINE_EXPORT TimeSeries
 {
 public:
     // Should match the DuplicatePolicy enum in python!!!
-    struct DuplicatePolicyTraits {
+    struct CSPENGINE_EXPORT DuplicatePolicyTraits {
         enum _enum : uint8_t {
             UNKNOWN = 0,
             LAST_VALUE = 1,
diff --git a/cpp/csp/python/CMakeLists.txt b/cpp/csp/python/CMakeLists.txt
index 2105ba9f0..4009811fb 100644
--- a/cpp/csp/python/CMakeLists.txt
+++ b/cpp/csp/python/CMakeLists.txt
@@ -26,7 +26,7 @@ message(STATUS "\n\n\nBinary directory: ${CMAKE_CURRENT_BINARY_DIR}\n\n\n")
 generate_export_header(csptypesimpl)
 set_target_properties(csptypesimpl PROPERTIES PUBLIC_HEADER "${CSPTYPESIMPL_PUBLIC_HEADERS}")
 target_compile_definitions(csptypesimpl PUBLIC RAPIDJSON_HAS_STDSTRING=1)
-target_link_libraries(csptypesimpl csp_core csp_types)
+target_link_libraries(csptypesimpl csp_core csp_types csp_engine)
 target_compile_definitions(csptypesimpl PRIVATE CSPTYPESIMPL_EXPORTS=1)