diff --git a/Jenkinsfile b/Jenkinsfile
index 855478400..2b856959b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -186,6 +186,7 @@ pipeline {
                         sh 'curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64'
                         sh 'chmod +x bazelisk-linux-amd64'
                         sh """
+                        rm -rf /var/tmp/_bazel_jenkins/install/*
                         ./bazelisk-linux-amd64 build //:xcore-opt \\
                           --verbose_failures \\
                           --linkopt=-lrt \\
@@ -196,6 +197,7 @@ pipeline {
                           --define SETUPTOOLS_SCM_VERSION=\$(python -m setuptools_scm -c ../python/pyproject.toml)
                       """
                         sh '''
+                        rm -rf /var/tmp/_bazel_jenkins/install/*
                         ./bazelisk-linux-amd64 test //Test:all \\
                           --verbose_failures \\
                           --test_output=errors \\
@@ -289,7 +291,8 @@ pipeline {
                         def cpuFlag = arch == 'arm64' ? 'darwin_arm64' : 'darwin_x86_64'
                         def outputName = "xcore-opt-${arch}"
                         sh """
-                      ./bazelisk-darwin-arm64 build //:xcore-opt \\
+                        rm -rf /var/tmp/_bazel_jenkins/install/*
+                        ./bazelisk-darwin-arm64 build //:xcore-opt \\
                         --cpu=${cpuFlag} \\
                         --remote_cache=${env.BAZEL_CACHE_URL} \\
                         --copt=-fvisibility=hidden \\
diff --git a/build.sh b/build.sh
index 9a09bbefb..8b56fbafd 100755
--- a/build.sh
+++ b/build.sh
@@ -131,7 +131,11 @@ create_zip() {
   mkdir -p build
   cd build
   if [ "$1" = "xcore" ]; then
-    cmake .. --toolchain=../lib_tflite_micro/submodules/xmos_cmake_toolchain/xs3a.cmake
+    if xcc --version | grep -q 'XTC version: 99.99.99'; then
+      cmake .. --toolchain=$(which xcc)/../../build/xcommon_cmake/xcore_xs.cmake
+    else
+      cmake .. --toolchain=../lib_tflite_micro/submodules/xmos_cmake_toolchain/xs3a.cmake
+    fi
   else
     cmake .. -DLIB_NAME=x86tflitemicro
   fi
diff --git a/third_party/lib_nn b/third_party/lib_nn
index d756600c9..b2e88580a 160000
--- a/third_party/lib_nn
+++ b/third_party/lib_nn
@@ -1 +1 @@
-Subproject commit d756600c966499ba67321f17e4f2d601fd29aa57
+Subproject commit b2e88580ae7093a821671aae4aecbf28a0dc0c62
diff --git a/third_party/lib_tflite_micro b/third_party/lib_tflite_micro
index 642ac44e7..7cd46fd83 160000
--- a/third_party/lib_tflite_micro
+++ b/third_party/lib_tflite_micro
@@ -1 +1 @@
-Subproject commit 642ac44e7a61e657195c433610cbd443c74b98f7
+Subproject commit 7cd46fd83d12c3603c40902521b9d8ad189d32b7