diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs
index f04346ddb..9395bad78 100644
--- a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs
+++ b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs
@@ -147,7 +147,7 @@ public IAccountState GetAccountState(BlockHash? offset)
             }
 
             public IAccountState GetAccountState(HashDigest<SHA256>? hash)
-                => throw new NotImplementedException();
+                => _source.GetAccountState(hash);
         }
 
         private sealed class LocalCacheAccountState : IAccountState
diff --git a/NineChronicles.Headless.Tests/Common/MockState.cs b/NineChronicles.Headless.Tests/Common/MockState.cs
index 54ac73e76..2ca86f1b0 100644
--- a/NineChronicles.Headless.Tests/Common/MockState.cs
+++ b/NineChronicles.Headless.Tests/Common/MockState.cs
@@ -86,10 +86,7 @@ private MockState(
 
         public ValidatorSet ValidatorSet => _validatorSet;
 
-        public ITrie Trie
-        {
-            get => new MerkleTrie(new MemoryKeyValueStore());
-        }
+        public ITrie Trie => throw new NotSupportedException();
 
         public IValue? GetState(Address address) => _states.TryGetValue(address, out IValue? value)
             ? value
diff --git a/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs b/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs
index 9a129a488..ae7394372 100644
--- a/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs
+++ b/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs
@@ -121,7 +121,7 @@ public StandaloneQuery(StandaloneContext standaloneContext, IConfiguration confi
                     var recipient = context.GetArgument<Address?>("recipient");
 
                     IEnumerable<Transaction> blockTxs = digest.TxIds
-                        .Select(b => new TxId(b.ToBuilder().ToArray()))
+                        .Select(bytes => new TxId(bytes))
                         .Select(store.GetTransaction);
 
                     var filtered = blockTxs