diff --git a/src/Buddy.csproj b/src/Buddy.csproj
index e815361..dfc3509 100644
--- a/src/Buddy.csproj
+++ b/src/Buddy.csproj
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,10 +36,8 @@
     <Compile Include="Buddy.cs" />
     <Compile Include="BuddyAcceptCommand.cs" />
     <Compile Include="BuddyCommand.cs" />
-    <Compile Include="CommandHandler.cs" />
     <Compile Include="Config.cs" />
     <Compile Include="EventHandlers.cs" />
-    <Compile Include="ICommandPint.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnBuddyCommand.cs" />
   </ItemGroup>
diff --git a/src/BuddyAcceptCommand.cs b/src/BuddyAcceptCommand.cs
index f034e0d..831cfb4 100644
--- a/src/BuddyAcceptCommand.cs
+++ b/src/BuddyAcceptCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Buddy
 {
-    [CommandHandler(typeof(GameConsoleCommandHandler))]
+    [CommandHandler(typeof(ClientCommandHandler))]
     class BuddyAcceptCommand : ICommand
     {
         public string Command => Buddy.singleton.getLang("buddyAcceptCommand");
@@ -19,9 +19,9 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
         {
             response = "";
             string[] args = arguments.ToArray();
-            if (sender is PlayerCommandSender p)
+            if (sender is PlayerCommandSender)
             {
-                Player player = Player.Get(p.Processor._hub);
+                Player player = Player.Get(((CommandSender)sender).SenderId);
                 response = handleBuddyAcceptCommand(player, new string[] { });
                 return true;
             }
diff --git a/src/BuddyCommand.cs b/src/BuddyCommand.cs
index 35e040f..ab6dc15 100644
--- a/src/BuddyCommand.cs
+++ b/src/BuddyCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Buddy
 {
-    [CommandHandler(typeof(GameConsoleCommandHandler))]
+    [CommandHandler(typeof(ClientCommandHandler))]
     class BuddyCommand : ICommand
     {
         public string Command => Buddy.singleton.getLang("buddyCommand");
@@ -19,9 +19,9 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
         {
             response = "";
             string[] args = arguments.ToArray();
-            if(sender is PlayerCommandSender p)
+            if(sender is PlayerCommandSender)
             {
-                Player player = Player.Get(p.Processor._hub);
+                Player player = Player.Get(((CommandSender)sender).SenderId);
                 if (args.Length != 1)
                 {
                     response = Buddy.singleton.getLang("invalidUsage");
diff --git a/src/UnBuddyCommand.cs b/src/UnBuddyCommand.cs
index 89abb5e..d6f6dbe 100644
--- a/src/UnBuddyCommand.cs
+++ b/src/UnBuddyCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Buddy
 {
-    [CommandHandler(typeof(GameConsoleCommandHandler))]
+    [CommandHandler(typeof(ClientCommandHandler))]
     class UnBuddyCommand : ICommand
     {
         public string Command => Buddy.singleton.getLang("buddyUnbuddyCommand");
@@ -19,9 +19,9 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
         {
             response = "";
             string[] args = arguments.ToArray();
-            if (sender is PlayerCommandSender p)
+            if (sender is PlayerCommandSender)
             {
-                Player player = Player.Get(p.Processor._hub);
+                Player player = Player.Get(((CommandSender)sender).SenderId);
                 response = handleUnBuddyCommand(player);
                 return true;
             }