diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index bd1e1043..89431633 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -106,17 +106,6 @@ jobs:
         run: |
           cmake --build build --config Release
 
-      # A preliminary smoke test to determine basic functional python
-      # To be replaced with something proper when testing lands
-      - name: 🚭 PySmokeTest
-        shell: bash
-        env:
-          PYTHONPATH: build/output/python/
-        run: |
-          ./build/vcpkg_installed/x64-windows/tools/python3/python.exe -c 'from kadas.kadasgui import *'
-          ./build/vcpkg_installed/x64-windows/tools/python3/python.exe -c 'from kadas.kadascore import *'
-          ./build/vcpkg_installed/x64-windows/tools/python3/python.exe -c 'from kadas.kadasanalysis import *'
-
       - name: 📦 Package
         run: |
           cmake --build build --target bundle --config Release
@@ -136,6 +125,23 @@ jobs:
           path: |
             build/kadas-*-win64.msi
 
+      # A preliminary smoke test to determine basic functional python
+      # To be replaced with something proper when testing lands
+      - name: 🚭 PySmokeTest
+        shell: bash
+        env:
+          PYTHONPATH: build/output/python/
+        run: |
+          set -e
+          $(./build/vcpkg_installed/x64-windows/tools/python3/python.exe <<EOF
+          import os   
+          os.add_dll_directory(os.getcwd() + '/build/output/bin')
+          from kadas.kadasgui import *
+          from kadas.kadascore import *
+          from kadas.kadasanalysis import *
+          EOF
+          )
+
       - name: Upload release assets
         uses: softprops/action-gh-release@v2
         if: ${{ github.event_name == 'release' }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21ea627..78701f3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,10 @@ include(GenerateExportHeader)
 
 set(CMAKE_CXX_STANDARD 17)
 
+set(BUILD_SHARED_LIBS
+    ON
+    CACHE BOOL "Build using shared libraries"
+)
 set(KADAS_NAME
     "Kadas"
     CACHE STRING "Kadas application name"
diff --git a/kadas/app/kadasbookmarksmenu.h b/kadas/app/kadasbookmarksmenu.h
index 514b194e..b575a366 100644
--- a/kadas/app/kadasbookmarksmenu.h
+++ b/kadas/app/kadasbookmarksmenu.h
@@ -29,7 +29,7 @@ class QgsMapCanvas;
 class QgsMessageBar;
 
 
-class KADAS_GUI_EXPORT KadasBookmarksMenu : public QMenu
+class KadasBookmarksMenu : public QMenu
 {
     Q_OBJECT
   public:
diff --git a/kadas/gui/kadasmapcanvasitemmanager.cpp b/kadas/gui/kadasmapcanvasitemmanager.cpp
index a7610243..7a785241 100644
--- a/kadas/gui/kadasmapcanvasitemmanager.cpp
+++ b/kadas/gui/kadasmapcanvasitemmanager.cpp
@@ -20,6 +20,8 @@
 #include "kadas/gui/kadasmapcanvasitemmanager.h"
 #include "kadas/gui/mapitems/kadasmapitem.h"
 
+Q_GLOBAL_STATIC( KadasMapCanvasItemManager, sKadasMapCanvasItemManager )
+
 KadasMapCanvasItemManager::KadasMapCanvasItemManager()
 {
   connect( QgsProject::instance(), &QgsProject::readProject, this, &KadasMapCanvasItemManager::readFromProject );
@@ -28,8 +30,7 @@ KadasMapCanvasItemManager::KadasMapCanvasItemManager()
 
 KadasMapCanvasItemManager *KadasMapCanvasItemManager::instance()
 {
-  static KadasMapCanvasItemManager manager;
-  return &manager;
+  return sKadasMapCanvasItemManager;
 }
 
 void KadasMapCanvasItemManager::addItem( KadasMapItem *item )
diff --git a/kadas/gui/kadasmapcanvasitemmanager.h b/kadas/gui/kadasmapcanvasitemmanager.h
index 059298a1..f947cc47 100644
--- a/kadas/gui/kadasmapcanvasitemmanager.h
+++ b/kadas/gui/kadasmapcanvasitemmanager.h
@@ -34,6 +34,7 @@ class KADAS_GUI_EXPORT KadasMapCanvasItemManager : public QObject
     Q_OBJECT
 
   public:
+    KadasMapCanvasItemManager() SIP_FORCE;
     static KadasMapCanvasItemManager *instance();
     static void addItem( KadasMapItem *item );
     static void removeItem( KadasMapItem *item );
@@ -46,8 +47,6 @@ class KADAS_GUI_EXPORT KadasMapCanvasItemManager : public QObject
     void itemWillBeRemoved( const KadasMapItem *item );
 
   private:
-    KadasMapCanvasItemManager() SIP_FORCE;
-
     QList<KadasMapItem *> mMapItems;
 
   private slots: