diff --git a/library/xml b/library/xml
index 614548ce6..5653a57e0 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 614548ce67ef3d154297167ecacfd9b8c2d49875
+Subproject commit 5653a57e0978a78c1f1ef125b63359fefa7660f2
diff --git a/plugins/fastdwarf.cpp b/plugins/fastdwarf.cpp
index 09d831e26..975280ea1 100644
--- a/plugins/fastdwarf.cpp
+++ b/plugins/fastdwarf.cpp
@@ -123,55 +123,55 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
                 case unit_action_type::None:
                     break;
                 case unit_action_type::Move:
-                    action->data.move.timer = 1;
+                    action->data.Move.timer = 1;
                     break;
                 case unit_action_type::Attack:
                     // Attacks are executed when timer1 reaches zero, which will be
                     // on the following tick.
-                    if (action->data.attack.timer1 > 1)
-                        action->data.attack.timer1 = 1;
+                    if (action->data.Attack.timer1 > 1)
+                        action->data.Attack.timer1 = 1;
                     // Attack actions are completed, and new ones generated, when
                     // timer2 reaches zero.
-                    if (action->data.attack.timer2 > 1)
-                        action->data.attack.timer2 = 1;
+                    if (action->data.Attack.timer2 > 1)
+                        action->data.Attack.timer2 = 1;
                     break;
                 case unit_action_type::HoldTerrain:
-                    action->data.holdterrain.timer = 1;
+                    action->data.HoldTerrain.timer = 1;
                     break;
                 case unit_action_type::Climb:
-                    action->data.climb.timer = 1;
+                    action->data.Climb.timer = 1;
                     break;
                 case unit_action_type::Job:
-                    action->data.job.timer = 1;
+                    action->data.Job.timer = 1;
                     // could also patch the unit->job.current_job->completion_timer
                     break;
                 case unit_action_type::Talk:
-                    action->data.talk.timer = 1;
+                    action->data.Talk.timer = 1;
                     break;
                 case unit_action_type::Unsteady:
-                    action->data.unsteady.timer = 1;
+                    action->data.Unsteady.timer = 1;
                     break;
                 case unit_action_type::Dodge:
-                    action->data.dodge.timer = 1;
+                    action->data.Dodge.timer = 1;
                     break;
                 case unit_action_type::Recover:
-                    action->data.recover.timer = 1;
+                    action->data.Recover.timer = 1;
                     break;
                 case unit_action_type::StandUp:
-                    action->data.standup.timer = 1;
+                    action->data.StandUp.timer = 1;
                     break;
                 case unit_action_type::LieDown:
-                    action->data.liedown.timer = 1;
+                    action->data.LieDown.timer = 1;
                     break;
                 case unit_action_type::Job2:
-                    action->data.job2.timer = 1;
+                    action->data.Job2.timer = 1;
                     // could also patch the unit->job.current_job->completion_timer
                     break;
                 case unit_action_type::PushObject:
-                    action->data.pushobject.timer = 1;
+                    action->data.PushObject.timer = 1;
                     break;
                 case unit_action_type::SuckBlood:
-                    action->data.suckblood.timer = 1;
+                    action->data.SuckBlood.timer = 1;
                     break;
                 case unit_action_type::Jump:
                 case unit_action_type::ReleaseTerrain:
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index f63ae5b2c..aeb242250 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1825,17 +1825,17 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
                 case unit_action_type::Move:
                     if (unit->path.path.x.size() > 0)
                     {
-                        send_unit->set_subpos_x(lerp(0, unit->path.path.x[0] - unit->pos.x, (float)(action->data.move.timer_init - action->data.move.timer) / action->data.move.timer_init));
-                        send_unit->set_subpos_y(lerp(0, unit->path.path.y[0] - unit->pos.y, (float)(action->data.move.timer_init - action->data.move.timer) / action->data.move.timer_init));
-                        send_unit->set_subpos_z(lerp(0, unit->path.path.z[0] - unit->pos.z, (float)(action->data.move.timer_init - action->data.move.timer) / action->data.move.timer_init));
+                        send_unit->set_subpos_x(lerp(0, unit->path.path.x[0] - unit->pos.x, (float)(action->data.Move.timer_init - action->data.Move.timer) / action->data.Move.timer_init));
+                        send_unit->set_subpos_y(lerp(0, unit->path.path.y[0] - unit->pos.y, (float)(action->data.Move.timer_init - action->data.Move.timer) / action->data.Move.timer_init));
+                        send_unit->set_subpos_z(lerp(0, unit->path.path.z[0] - unit->pos.z, (float)(action->data.Move.timer_init - action->data.Move.timer) / action->data.Move.timer_init));
                     }
                     break;
                 case unit_action_type::Job:
                     {
                     auto facing = send_unit->mutable_facing();
-                    facing->set_x(action->data.job.x - unit->pos.x);
-                    facing->set_y(action->data.job.y - unit->pos.y);
-                    facing->set_z(action->data.job.z - unit->pos.z);
+                    facing->set_x(action->data.Job.x - unit->pos.x);
+                    facing->set_y(action->data.Job.y - unit->pos.y);
+                    facing->set_z(action->data.Job.z - unit->pos.z);
                     }
                 default:
                     break;