diff --git a/extracommands/CommandLineCompositionRootSaveCommandPatch.cs b/extracommands/CommandLineCompositionRootSaveCommandPatch.cs
index 34c2837..168e40f 100644
--- a/extracommands/CommandLineCompositionRootSaveCommandPatch.cs
+++ b/extracommands/CommandLineCompositionRootSaveCommandPatch.cs
@@ -6,6 +6,7 @@ using Unity.Entities;
 using RobocraftX;
 using RobocraftX.GUI.CommandLine;
 using RobocraftX.Multiplayer;
+using RobocraftX.StateSync;
 using Svelto.ECS;
 using Svelto.Context;
 
@@ -43,10 +44,12 @@ namespace ExtraCommands
 
         static MethodBase TargetMethod(HarmonyInstance instance)
         {
-            return _ComposeMethodInfo(CommandLineCompositionRoot.Compose<UnityContext<FullGameCompositionRoot>>);
+            return _ComposeMethodInfo(CommandLineCompositionRoot.Compose);
         }
 
-        private static MethodInfo _ComposeMethodInfo(Action<UnityContext<FullGameCompositionRoot>, EnginesRoot, World, Action, MultiplayerInitParameters> a)
+        private delegate void ComposeAction(UnityContext<FullGameCompositionRoot> c, EnginesRoot r, World w, Action a,
+            MultiplayerInitParameters mip, ref StateSyncRegistrationHelper ssrh); //Ref params can't be used with Actions
+        private static MethodInfo _ComposeMethodInfo(ComposeAction a)
         {
             return a.Method;
         }
diff --git a/extracommands/ExtraCommands.csproj b/extracommands/ExtraCommands.csproj
index 1aa49c7..f07799a 100644
--- a/extracommands/ExtraCommands.csproj
+++ b/extracommands/ExtraCommands.csproj
@@ -55,6 +55,9 @@
     <Reference Include="RobocraftX.Physics">
       <HintPath>..\ref\RobocraftX.Physics.dll</HintPath>
     </Reference>
+    <Reference Include="RobocraftX.Services, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\ref\RobocraftX.Services.dll</HintPath>
+    </Reference>
     <Reference Include="RobocraftX.StateSync">
       <HintPath>..\ref\RobocraftX.StateSync.dll</HintPath>
     </Reference>
diff --git a/extracommands/MoveBlocksCommandEngine.cs b/extracommands/MoveBlocksCommandEngine.cs
index 960a9fa..a70b72a 100644
--- a/extracommands/MoveBlocksCommandEngine.cs
+++ b/extracommands/MoveBlocksCommandEngine.cs
@@ -151,7 +151,7 @@ namespace ExtraCommands.Building
             //GridConnectionsEntityStruct[] blockConnections;
             //MachineGraphConnectionEntityStruct[] connections;
 
-            Svelto.DataStructures.FasterList<uint> cubesToMove = new Svelto.DataStructures.FasterList<uint>();
+            Gamecraft.DataStructures.FasterList<uint> cubesToMove = new Gamecraft.DataStructures.FasterList<uint>();
             ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(entitiesDB, blockID, cubeStack, cubesToMove, (in GridConnectionsEntityStruct g) => { return false; });
             for(int i = 0; i < cubesToMove.Count; i++) {
                 TranslateSingleBlock(cubesToMove[i], translationVector);