diff --git a/.efrocachemap b/.efrocachemap
index 254fd6f2..7783493a 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -4038,26 +4038,26 @@
   "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
   "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
   "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "7ea21b956aa0575649262988b7049f37",
-  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "c996dca7ac3ac8cb9102f59b4edd559a",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fa6c0d0529bb81ecc1599bef9e1b7a4f",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "82bc337931e1b8a62e21fadbb35d5e20",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "5eb9c4cde16d5c712565e783f0d950dd",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b28d53c77d3ecdf4c4d65b3ee33939f6",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ceff0920782392b99b5aff053840f52e",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "912c9556a8f8c3c8427111c3612a780a",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5a3166f85284af6376b0124f6a2f85ae",
-  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "049b04cd9fb7c589a8a3503c183f32ca",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "8df5a16883aea84e673bbbffeb996ee2",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ed75be48842f35723b46d65ce3ff0309",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f5c512b0117e4140e3d4b2b01935400c",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ddb52b163d7967c453872118367522c5",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ff335ddc0573a11794aaf7a7267edf28",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "aae50a433b92b072cd9c9fadef788332",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a6a3e6502365e88117ebfa7a2fcca4ef",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "236223ba897a0ad01726adff2b5ca990",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "71819003709db16323b7220d5f7c78d6",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "55fc8b3223fd69fae8a2c790e7241bef",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "4475d67df942f8febc32936192750120",
+  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "4d7cbd0dd9d2c268ec19f4166cdebaf6",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "36bda46c71bfa44ef4f5fff83a7cee8c",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "f8bfa90df68abd510de758df9c6ff3c1",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f2701a0355249adfc052e0a174aa98d8",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "f209465e9c4b41982877e9607b55c69e",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "c70de98ce97a1fb381d5e2284adaf241",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "63af122be920611a51b74ab7fd2c5a64",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "7911794aa1ebb94145020ebb828fe7b7",
+  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "dd2a9813f8640b88f96ad13f0305ae0f",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "959e785b2d9eee30355b8e3a8bfe0fc4",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4d77bf8099c689622e08230e2465afd5",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6d6fe5cba0bce85a081956d91cd3a679",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "9c5faabe7b2f25ffa1bded3ac6e15ab5",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "b5522b5ef88707f2a152cf622740f2aa",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "872d53a99e512f205ab7c639c4732704",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "52342bdc33fcecaf17a2e39ab072bace",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "627e5ef0e8d3b4074edd30492d1d6478",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "be00f02bc30127d88c809ba9232c9ce7",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "276a4800fd8745ad14ef728d6c7ffe53",
   "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
   "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "ae936a119668ede7b36f38c8672f4bf8",
   "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
@@ -4074,14 +4074,14 @@
   "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
   "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "c20363fe2af3d54e666b1c8ee67f6b76",
   "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "af8b790f9f8d96740b09ef1a2d84aac8",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d65d2cbf7f882756fa35fecbe89fe961",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "51e89466567087a660c4e8fbf0590868",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d31d8d10b9dfe1408eff4f7ef638a855",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "3b594417a6d6b8b26dc7d1f8934c00b0",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "c5f1b0f3cafad705d946195f387d56d4",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "63e3c96246155705e270f0b71ba58210",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a3cc059c0057ef9f6d70c39c660ce0d7",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "1c404ba60239ba22214f9986c24be240",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "90a80a91309d545d7958c646882cbe2b",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b31e2ca31632b7d061af0a27d9e9b4cf",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "ee015e1287d1e94628366e995e44c4d6",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "58000c92a46f163ced57a63a7de9450d",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "62fae805bb3025f4f6646e564ffadd9a",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1b5989770bc150ba4ca5de7405d998b0",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "325a1a5fc43a7054e80ff3c360ba0b94",
   "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
   "src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7",
   "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b829079d..4465ca16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.36 (build 21907, api 8, 2024-07-03)
+### 1.7.36 (build 21909, api 8, 2024-07-03)
 - Wired up initial support for using asset-packages for bundled assets.
 - bacloud workspace commands are now a bit smarter; you can now do things like 
   `bacloud workspace put .` or even just `bacloud workspace put` and it will
diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py
index 337db32b..f0e07a58 100644
--- a/src/assets/ba_data/python/baenv.py
+++ b/src/assets/ba_data/python/baenv.py
@@ -52,7 +52,7 @@ if TYPE_CHECKING:
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21907
+TARGET_BALLISTICA_BUILD = 21909
 TARGET_BALLISTICA_VERSION = '1.7.36'
 
 
diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc
index 0897dbc7..d094f8ed 100644
--- a/src/ballistica/shared/ballistica.cc
+++ b/src/ballistica/shared/ballistica.cc
@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21907;
+const int kEngineBuildNumber = 21909;
 const char* kEngineVersion = "1.7.36";
 const int kEngineApiVersion = 8;
 
diff --git a/tools/batools/staging.py b/tools/batools/staging.py
index 4be238e5..2d28e117 100755
--- a/tools/batools/staging.py
+++ b/tools/batools/staging.py
@@ -661,7 +661,7 @@ class AssetStager:
                             executor.submit(
                                 _sync_path,
                                 src=(
-                                    f'.cache/assetdata/'
+                                    f'{self.projroot}/.cache/assetdata/'
                                     f'{asset_file_cache_path(hashval)}'
                                 ),
                                 dst=os.path.join(self.dst, path),