diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index efa1f73e..b6f53874 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -48,7 +48,7 @@ jobs:
           brew install portaudio
           python -m pip install --upgrade pip
           pip3 install pyaudio
-          export PYTHONPATH=/opt/homebrew/opt/portaudio/lib/:$PYTHONPATH
+          export PYTHONPATH=/usr/local/lib/:$PYTHONPATH          
 
       - name: Install Python dependencies
         run: |
diff --git a/freedata-nsis-config.nsi b/freedata-nsis-config.nsi
index b95c457f..504dfa10 100644
--- a/freedata-nsis-config.nsi
+++ b/freedata-nsis-config.nsi
@@ -67,13 +67,13 @@ doneBackup:
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
   ; Create a Start Menu directory
-  CreateDirectory "$SMPROGRAMS\${StartMenuFolder}"
+  CreateDirectory "$COMMON_STARTMENU\${StartMenuFolder}"
 
   ; Create shortcut in the Start Menu directory
-  CreateShortCut "$SMPROGRAMS\${StartMenuFolder}\FreeDATA Server.lnk" "$INSTDIR\freedata-server\freedata-server.exe"
+  CreateShortCut "$COMMON_STARTMENU\${StartMenuFolder}\FreeDATA Server.lnk" "$INSTDIR\freedata-server\freedata-server.exe"
 
   ; Create an Uninstall shortcut
-  CreateShortCut "$SMPROGRAMS\${StartMenuFolder}\Uninstall FreeDATA.lnk" "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$COMMON_STARTMENU\${StartMenuFolder}\Uninstall FreeDATA.lnk" "$INSTDIR\Uninstall.exe"
 
 
   ; Backup "config.ini" before overwriting files
@@ -101,10 +101,10 @@ Section "FreeData x64 GUI" SEC02
   CreateShortCut "$DESKTOP\FreeDATA GUI.lnk" "$INSTDIR\freedata-gui\freedata.exe"
 
   ; Create a start menu shortcut
-  CreateShortCut "$SMPROGRAMS\${StartMenuFolder}\FreeDATA GUI.lnk" "$INSTDIR\freedata-gui\freedata.exe"
+  CreateShortCut "$COMMON_STARTMENU\${StartMenuFolder}\FreeDATA GUI.lnk" "$INSTDIR\freedata-gui\freedata.exe"
 
   ; Create an Uninstall shortcut
-  CreateShortCut "$SMPROGRAMS\${StartMenuFolder}\Uninstall FreeDATA.lnk" "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$COMMON_STARTMENU\${StartMenuFolder}\Uninstall FreeDATA.lnk" "$INSTDIR\Uninstall.exe"
 
 SectionEnd
 
@@ -123,8 +123,8 @@ Section "Uninstall"
   Delete "$DESKTOP\FreeDATA GUI.lnk"
 
 ; Remove Start Menu shortcuts
-  Delete "$SMPROGRAMS\${StartMenuFolder}\*.*"
-  RMDir "$SMPROGRAMS\${StartMenuFolder}"
+  Delete "$COMMON_STARTMENU\${StartMenuFolder}\*.*"
+  RMDir "$COMMON_STARTMENU\${StartMenuFolder}"
 
   ; Attempt to delete the uninstaller itself
   Delete $EXEPATH