diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7d0543e6c..66d6c8112 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -59,6 +59,7 @@
         "iostream": "cpp",
         "cstdint": "cpp",
         "ostream": "cpp",
-        "__memory": "cpp"
+        "__memory": "cpp",
+        "iosfwd": "cpp"
     }
 }
diff --git a/src/common/ZipHandler.cxx b/src/common/ZipHandler.cxx
index 06bdfd3a8..b017b0b80 100644
--- a/src/common/ZipHandler.cxx
+++ b/src/common/ZipHandler.cxx
@@ -256,7 +256,7 @@ ZipHandler::zip_error ZipHandler::zip_file_open(const char* filename, zip_file**
     goto error;
   }
 
-  strcpy_s(string, strlen(filename) + 1, filename);
+  strncpy(string, filename, strlen(filename) + 1);
   newzip->filename = string;
   *zip = newzip;
 
diff --git a/src/debugger/gui/PromptWidget.cxx b/src/debugger/gui/PromptWidget.cxx
index 431c3f817..2713d2d89 100644
--- a/src/debugger/gui/PromptWidget.cxx
+++ b/src/debugger/gui/PromptWidget.cxx
@@ -689,7 +689,7 @@ void PromptWidget::textPaste()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void PromptWidget::addToHistory(const char* str)
 {
-  strncpy_s(_history[_historyIndex], str, kLineBufferSize - 1);  
+  strncpy(_history[_historyIndex], str, kLineBufferSize - 1);
   _historyIndex = (_historyIndex + 1) % kHistorySize;
   _historyLine = 0;
 
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index 071e13d99..f6faa9482 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -1242,7 +1242,9 @@ void TIA::cycle(uInt32 colorClocks)
     if (++myHctr >= 228)
       nextLine();
 
-    myAudio.tick();
+    #ifdef SOUND_SUPPORT
+      myAudio.tick();
+    #endif
 
     ++myTimestamp;
   }