diff --git a/dbal/cpp/build-config/CMakeLists.txt b/dbal/cpp/build-config/CMakeLists.txt
index 62e01a86e..74b49345f 100644
--- a/dbal/cpp/build-config/CMakeLists.txt
+++ b/dbal/cpp/build-config/CMakeLists.txt
@@ -93,4 +93,4 @@ add_test(NAME integration_tests COMMAND integration_tests)
 add_test(NAME conformance_tests COMMAND conformance_tests)
 
 install(TARGETS dbal_daemon DESTINATION bin)
-install(DIRECTORY include/dbal DESTINATION include)
+install(DIRECTORY ${DBAL_INCLUDE_DIR}/dbal DESTINATION include)
diff --git a/frontends/nextjs/src/lib/db/lua-scripts/serialization/build-lua-script-update.ts b/frontends/nextjs/src/lib/db/lua-scripts/serialization/build-lua-script-update.ts
index 9bbefa9a3..631f9f414 100644
--- a/frontends/nextjs/src/lib/db/lua-scripts/serialization/build-lua-script-update.ts
+++ b/frontends/nextjs/src/lib/db/lua-scripts/serialization/build-lua-script-update.ts
@@ -1,5 +1,5 @@
-import type { LuaScript } from '../../types/level-types'
-import { normalizeAllowedGlobals } from '../../lua/functions/sandbox/normalize-allowed-globals'
+import type { LuaScript } from '../../../types/level-types'
+import { normalizeAllowedGlobals } from '../../../lua/functions/sandbox/globals/normalize-allowed-globals'
 
 export function buildLuaScriptUpdate(updates: Partial<LuaScript>): Record<string, unknown> {
   const data: Record<string, unknown> = {}
diff --git a/frontends/nextjs/src/lib/db/lua-scripts/serialization/serialize-lua-script.ts b/frontends/nextjs/src/lib/db/lua-scripts/serialization/serialize-lua-script.ts
index 06662f2f5..8ad2f7730 100644
--- a/frontends/nextjs/src/lib/db/lua-scripts/serialization/serialize-lua-script.ts
+++ b/frontends/nextjs/src/lib/db/lua-scripts/serialization/serialize-lua-script.ts
@@ -1,5 +1,5 @@
-import type { LuaScript } from '../../types/level-types'
-import { normalizeAllowedGlobals } from '../../lua/functions/sandbox/normalize-allowed-globals'
+import type { LuaScript } from '../../../types/level-types'
+import { normalizeAllowedGlobals } from '../../../lua/functions/sandbox/globals/normalize-allowed-globals'
 
 export function serializeLuaScript(script: LuaScript): Record<string, unknown> {
   const allowedGlobals = normalizeAllowedGlobals(script.allowedGlobals)