diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 633b1c96..005fdfe4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -4019,7 +4019,7 @@ namespace TShockAPI
 				}
 			}
 
-			if (args.Player.InventorySlotAvailable || item.name.Contains("Coin"))
+			if (args.Player.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905) || item.type == 58 || item.type == 184)
 			{
 				if (itemAmount == 0 || itemAmount > item.maxStack)
 					itemAmount = item.maxStack;
@@ -4099,7 +4099,7 @@ namespace TShockAPI
 					else
 					{
 						var plr = players[0];
-						if (plr.InventorySlotAvailable || item.name.Contains("Coin"))
+						if (plr.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905)  || item.type == 58 || item.type == 184)
 						{
 							if (itemAmount == 0 || itemAmount > item.maxStack)
 								itemAmount = item.maxStack;
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index e98168cb..39eb77b2 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -946,7 +946,7 @@ namespace TShockAPI
 				return;
 			}*/
 
-			if (args.Text.StartsWith("/"))
+			if (args.Text.StartsWith("/") & args.Text.Length > 1)
 			{
 				try
 				{