diff --git a/.codeql-prebuild-cpp-Linux.sh b/.codeql-prebuild-cpp-Linux.sh
index 493d480..4a5a695 100644
--- a/.codeql-prebuild-cpp-Linux.sh
+++ b/.codeql-prebuild-cpp-Linux.sh
@@ -1,4 +1,4 @@
-# install dependencies for C++ analysis
+#!/bin/bash
 set -e
 
 # install dependencies
@@ -16,15 +16,15 @@ sudo apt-get update
 sudo apt-get install --no-install-recommends -y "${dependencies[@]}"
 
 # build
-nxdk_dir="$(pwd)/third-party/nxdk"
-eval "$(${nxdk_dir}/bin/activate -s)"
-cd "${nxdk_dir}"
+export NXDK_DIR="$(pwd)/third-party/nxdk"
+eval "$(${NXDK_DIR}/bin/activate -s)"
+cd "${NXDK_DIR}"
 make NXDK_ONLY=y
 make tools
 
 cd "${GITHUB_WORKSPACE}"
 mkdir -p build
-cmake -DCMAKE_TOOLCHAIN_FILE="${nxdk_dir}/share/toolchain-nxdk.cmake" -B build -S .
+cmake -DCMAKE_TOOLCHAIN_FILE="${NXDK_DIR}/share/toolchain-nxdk.cmake" -B build -S .
 cmake --build build
 
 # skip autobuild
diff --git a/.codeql-prebuild-cpp-Windows.sh b/.codeql-prebuild-cpp-Windows.sh
index 78ec796..874904f 100644
--- a/.codeql-prebuild-cpp-Windows.sh
+++ b/.codeql-prebuild-cpp-Windows.sh
@@ -1,4 +1,4 @@
-# install dependencies for C++ analysis
+#!/bin/bash
 set -e
 
 # update pacman
@@ -11,23 +11,23 @@ dependencies=(
   "git"
   "bison"
   "flex"
-  "mingw-w64-x86_64-gcc"
-  "mingw-w64-x86_64-llvm"
-  "mingw-w64-x86_64-clang"
-  "mingw-w64-x86_64-lld"
+  "mingw-w64-ucrt-x86_64-gcc"
+  "mingw-w64-ucrt-x86_64-llvm"
+  "mingw-w64-ucrt-x86_64-clang"
+  "mingw-w64-ucrt-x86_64-lld"
 )
 pacman -S --noconfirm "${dependencies[@]}"
 
 # build
-nxdk_dir="$(pwd)/third-party/nxdk"
-eval "$(${nxdk_dir}/bin/activate -s)"
-cd "${nxdk_dir}"
+export NXDK_DIR="$(pwd)/third-party/nxdk"
+eval "$(${NXDK_DIR}/bin/activate -s)"
+cd "${NXDK_DIR}"
 make NXDK_ONLY=y
 make tools
 
 cd "${GITHUB_WORKSPACE}"
 mkdir -p build
-cmake -DCMAKE_TOOLCHAIN_FILE="${nxdk_dir}/share/toolchain-nxdk.cmake" -B build -S .
+cmake -DCMAKE_TOOLCHAIN_FILE="${NXDK_DIR}/share/toolchain-nxdk.cmake" -B build -S .
 cmake --build build
 
 # skip autobuild
diff --git a/.codeql-prebuild-cpp-macOS.sh b/.codeql-prebuild-cpp-macOS.sh
index f46c16e..a7a8e74 100644
--- a/.codeql-prebuild-cpp-macOS.sh
+++ b/.codeql-prebuild-cpp-macOS.sh
@@ -1,4 +1,4 @@
-# install dependencies for C++ analysis
+#!/bin/bash
 set -e
 
 # install dependencies
@@ -11,15 +11,15 @@ dependencies=(
 brew install "${dependencies[@]}"
 
 # build
-nxdk_dir="$(pwd)/third-party/nxdk"
-eval "$(${nxdk_dir}/bin/activate -s)"
-cd "${nxdk_dir}"
+export NXDK_DIR="$(pwd)/third-party/nxdk"
+eval "$(${NXDK_DIR}/bin/activate -s)"
+cd "${NXDK_DIR}"
 make NXDK_ONLY=y
 make tools
 
 cd "${GITHUB_WORKSPACE}"
 mkdir -p build
-cmake -DCMAKE_TOOLCHAIN_FILE="${nxdk_dir}/share/toolchain-nxdk.cmake" -B build -S .
+cmake -DCMAKE_TOOLCHAIN_FILE="${NXDK_DIR}/share/toolchain-nxdk.cmake" -B build -S .
 cmake --build build
 
 # skip autobuild
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6defac5..13d57b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,3 @@ add_dependencies(xbe_iso cxbe_convert)
 
 set_target_properties(cxbe_convert PROPERTIES OUTPUT_QUIET ON)
 set_target_properties(xbe_iso PROPERTIES OUTPUT_QUIET ON)
-
-#add_xbe(xbe_file "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.exe" TITLE "${XBE_TITLE}" RESOURCE_DIRS xbe)
-#add_xiso(xiso xbe_file XISO ${XBOX_ISO})
diff --git a/README.md b/README.md
index 2ad1fd5..ef6cb82 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ This script takes care of everything, except installing the prerequisites.
       - [x] Separate main build and unit test builds, due to cross compiling, see https://stackoverflow.com/a/64335131/11214013
       - [ ] Get tests to properly compile
       - [ ] Enable codecov
-   - [ ] Enable sonarcloud
+   - [x] Enable sonarcloud
    - [ ] Build moonlight-common-c
       - [ ] Build custom enet, depends on https://github.com/XboxDev/nxdk/pull/680 or https://github.com/thrimbor/nxdk/tree/winsock/lib/winapi (seems unlikely nxdk will ever be ready for this, could definitely use some help with this)
 - Menus / Screens