diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 12bd198d..4f5716c5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 ### Please make you search through our existing [issues](https://github.com/Marus/cortex-debug/issues?q=type:issue) (both open and closed)
+Please visit the correct repo to file an issue. If this is an issue with
+* Peripherals/SVD Viewer: [https://github.com/mcu-debug/peripheral-viewer](https://github.com/mcu-debug/peripheral-viewer)
+* Memory Viewer: [https://github.com/mcu-debug/memview](https://github.com/mcu-debug/memview)
+* RTOS Viewer: [https://github.com/mcu-debug/rtos-views](https://github.com/mcu-debug/rtos-views)
+* the debugger itself, continue below
 
 **Describe the bug**
 A clear and concise description of what the bug is.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7d..fae515a0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,12 @@ assignees: ''
 
 ---
 
+Please visit the correct repo to file an feature request. If this is an feature for
+* Peripherals/SVD Viewer: [https://github.com/mcu-debug/peripheral-viewer](https://github.com/mcu-debug/peripheral-viewer)
+* Memory Viewer: [https://github.com/mcu-debug/memview](https://github.com/mcu-debug/memview)
+* RTOS Viewer: [https://github.com/mcu-debug/rtos-views](https://github.com/mcu-debug/rtos-views)
+* the debugger itself, continue below
+
 **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 [...]
 
diff --git a/package.json b/package.json
index b3832f18..d57cf247 100644
--- a/package.json
+++ b/package.json
@@ -1583,7 +1583,7 @@
                             },
                             "targetId": {
                                 "description": "On BMP this is the ID number that should be passed to the attach command (defaults to 1); for PyOCD this is the target identifier (only needed for custom hardware)",
-                                "type": "string | number",
+                                "type": ["string", "number"],
                                 "anyOf": [
                                     {
                                         "type": "string"
@@ -2732,6 +2732,7 @@
                             },
                             "targetId": {
                                 "description": "On BMP this is the ID number that should be passed to the attach command (defaults to 1); for PyOCD this is the target identifier (only needed for custom hardware)",
+                                "type": ["string", "number"],
                                 "anyOf": [
                                     {
                                         "type": "string"