diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 95905f6aa..cdbc0a56f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,26 +12,36 @@ body:
       label: What happened?
       description: Also tell us, what did you expect to happen?
       placeholder: Tell us what you see!
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Configuration file
       description: Please copy and paste your machine configuration file (`86box.cfg`). This will be automatically formatted into code, so no need for backticks.
       render: ini
+    validations:
+      required: true
   - type: input
     attributes:
       label: Operating system
       description: What is your host operating system?
       placeholder: e.g. Windows 10
+    validations:
+      required: true
   - type: input
     attributes:
       label: CPU
       description: What is your host CPU?
       placeholder: e.g. AMD Ryzen 5 5600G
+    validations:
+      required: true
   - type: input
     attributes:
       label: 86Box version
       description: What version of 86Box are you running? (Saying "Latest from Jenkins" is not helpful.)
       placeholder: e.g. v4.0 build 5000
+    validations:
+      required: true
   - type: dropdown
     attributes:
       label: Build architecture
@@ -44,6 +54,8 @@ body:
         - macOS - Universal (Intel and Apple Silicon) 
         - Windows - x64 (64-bit) 
         - Windows - x86 (32-bit)
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Build type
@@ -60,6 +72,8 @@ body:
         - Manager auto-update
         - I built 86Box myself (please tell us more about your build configuration)
         - I got 86Box from a third party repository (please tell us where)
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Additional context
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index cc1ec7f8e..c03c50764 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Question
+  - name: Machine Request
+    url:  https://github.com/86Box/86Box/issues/3577#issue-comment-box
+    about: Please submit machine addition requests under this tracking issue.
+  - name: Feature Request or Question
     url:  https://github.com/86Box/86Box/discussions
-    about: Please ask and answer questions here.
+    about: Please submit feature requests and ask questions here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 4fe86d5ec..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 7cb5ec3a7..e02b9c25c 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -571,8 +571,6 @@ MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.
 MEMOBJ := catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o mmu_2386.o rom.o row.o \
           smram.o spd.o sst_flash.o
 
-CPU808XOBJ := queue.o
-
 CPUOBJ := $(DYNARECOBJ) \
           $(CGTOBJ) \
           cpu.o cpu_table.o fpu.o x86.o \
@@ -801,7 +799,7 @@ ifeq ($(RTMIDI), y)
  SNDOBJ += midi_rtmidi.o
 endif
 
-OBJ := $(MAINOBJ) $(CPU808XOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) $(DEVOBJ) $(MEMOBJ) \
+OBJ := $(MAINOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) $(DEVOBJ) $(MEMOBJ) \
        $(FDDOBJ) $(GAMEOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) $(MINIVHDOBJ) \
        $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SIOOBJ) $(SNDOBJ) $(VIDOBJ) $(VOODOOOBJ) \
        $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(MINITRACEOBJ) $(THREADOBJ)