diff --git a/src/Tgstation.Server.Client/IInstanceManagerClient.cs b/src/Tgstation.Server.Client/IInstanceManagerClient.cs
index c06d23c69f..644a311840 100644
--- a/src/Tgstation.Server.Client/IInstanceManagerClient.cs
+++ b/src/Tgstation.Server.Client/IInstanceManagerClient.cs
@@ -66,6 +66,6 @@ namespace Tgstation.Server.Client
 		/// </summary>
 		/// <param name="instance">The <see cref="EntityId"/> of the <see cref="Instance"/> to create an <see cref="IInstanceClient"/> for</param>
 		/// <returns>A new <see cref="IInstanceClient"/></returns>
-		IInstanceClient CreateClient(EntityId instance);
+		IInstanceClient CreateClient(Instance instance);
 	}
 }
diff --git a/src/Tgstation.Server.Client/InstanceManagerClient.cs b/src/Tgstation.Server.Client/InstanceManagerClient.cs
index 7d993d8ea2..089cd3bcb7 100644
--- a/src/Tgstation.Server.Client/InstanceManagerClient.cs
+++ b/src/Tgstation.Server.Client/InstanceManagerClient.cs
@@ -41,11 +41,17 @@ namespace Tgstation.Server.Client
 		public Task GrantPermissions(EntityId instance, CancellationToken cancellationToken) => ApiClient.Patch(Routes.SetID(Routes.InstanceManager, instance?.Id ?? throw new ArgumentNullException(nameof(instance))), cancellationToken);
 
 		/// <inheritdoc />
-		public IInstanceClient CreateClient(EntityId instance) => new InstanceClient(
-			ApiClient,
-			new InstanceResponse
-			{
-				Id = instance?.Id ?? throw new ArgumentNullException(nameof(instance))
-			});
+		public IInstanceClient CreateClient(Instance instance)
+		{
+			if (instance == null)
+				throw new ArgumentNullException(nameof(instance));
+
+			if (!instance.Id.HasValue)
+				throw new ArgumentException("Instance missing Id!", nameof(instance));
+
+			return new InstanceClient(
+				ApiClient,
+				instance);
+		}
 	}
 }
diff --git a/tests/Tgstation.Server.Tests/Instance/ChatTest.cs b/tests/Tgstation.Server.Tests/Instance/ChatTest.cs
index 1df13a4a17..e6c99c511a 100644
--- a/tests/Tgstation.Server.Tests/Instance/ChatTest.cs
+++ b/tests/Tgstation.Server.Tests/Instance/ChatTest.cs
@@ -202,7 +202,8 @@ namespace Tgstation.Server.Tests.Instance
 			var discordBotReq = new ChatBotUpdateRequest
 			{
 				Id = ogDiscordBot.Id,
-				Channels = ogDiscordBot.Channels.ToList()
+				Channels = ogDiscordBot.Channels.ToList(),
+				ChannelLimit = 1
 			};
 
 			// We limited chat bots and channels to 1 and 2 respectively, try violating them
diff --git a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
index 9914b73a71..2accf9c5ba 100644
--- a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
+++ b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
@@ -72,7 +72,7 @@ namespace Tgstation.Server.Tests.Instance
 			await WaitForJob(clone.ActiveJob, 9000, false, null, cancellationToken).ConfigureAwait(false);
 			var readAfterClone = await repositoryClient.Read(cancellationToken);
 
-			Assert.AreEqual(initalRepo.Origin, readAfterClone.Origin);
+			Assert.AreEqual(cloneRequest.Origin, readAfterClone.Origin);
 			Assert.AreEqual(workingBranch, readAfterClone.Reference);
 			Assert.IsNotNull(readAfterClone.RevisionInformation);
 			Assert.IsNotNull(readAfterClone.RevisionInformation.ActiveTestMerges);
diff --git a/tests/Tgstation.Server.Tests/UsersTest.cs b/tests/Tgstation.Server.Tests/UsersTest.cs
index 0587191375..625b0cbc89 100644
--- a/tests/Tgstation.Server.Tests/UsersTest.cs
+++ b/tests/Tgstation.Server.Tests/UsersTest.cs
@@ -134,6 +134,7 @@ namespace Tgstation.Server.Tests
 
 			group = await serverClient.Groups.Update(new UserGroupUpdateRequest
 			{
+				Id = groups.First().Id,
 				PermissionSet = new PermissionSet
 				{
 					InstanceManagerRights = RightsHelper.AllRights<InstanceManagerRights>(),