diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index fa2d41410..886e0c4df 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -226,7 +226,7 @@ MOVEMENT_KEYS = {
     CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 },
 }
 
-local function get_movement_delta(key, delta, big_step)
+function get_movement_delta(key, delta, big_step)
     local info = MOVEMENT_KEYS[key]
     if info then
         if info[4] then
@@ -243,7 +243,7 @@ for i,v in ipairs(df.global.ui.main.hotkeys) do
     HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v
 end
 
-local function get_hotkey_target(key)
+function get_hotkey_target(key)
     local hk = HOTKEY_KEYS[key]
     if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then
         return xyz2pos(hk.x, hk.y, hk.z)
diff --git a/library/xml b/library/xml
index 44215836d..2be1fc4af 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23
+Subproject commit 2be1fc4afea4d3345b9b76d0f27f56087ac9b6e0
diff --git a/scripts b/scripts
index 4b38ccc83..c8394fa75 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4b38ccc83b074e87cedddf3941eb144cf45de020
+Subproject commit c8394fa75ff20abcdcdbe975dbf157d21882172e