diff --git a/res/modules/animation.lua b/res/modules/animation.lua
index 7dea2a4ff..21189989d 100644
--- a/res/modules/animation.lua
+++ b/res/modules/animation.lua
@@ -167,10 +167,10 @@ function this.compile_track(linesets)
     local memoised = {}
     local keysets = {}
 
-    for i, lineset in ipairs(linesets) do
+    for bone, lineset in pairs(linesets) do
         local lineset_code = codegen_track(lineset.lines, memoised, keysets)
         code = code .. "\n do" .. lineset_code .. "\n end\n" ..
-            " rig:set_matrix(" .. lineset.bone_index .. ", dst)\n"
+            " rig:set_matrix(rig:index(" .. string.escape(bone) .. "), dst)\n"
     end
 
     local memoised_code = ""
diff --git a/src/logic/scripting/lua/libs/libxml.cpp b/src/logic/scripting/lua/libs/libxml.cpp
index 70ccc36bb..b28b0a5fd 100644
--- a/src/logic/scripting/lua/libs/libxml.cpp
+++ b/src/logic/scripting/lua/libs/libxml.cpp
@@ -2,7 +2,6 @@
 #include "api_lua.hpp"
 
 static const char* TAG_ATTR = "#";
-static const char* DEFAULT_ROOT_TAG = "root";
 
 static int push_xml(lua::State* L, const xml::xmlelement& elem) {
     if (elem.isText()) {