diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index a16f8031a..d15a86d7e 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -121,8 +121,8 @@ public class AlternativeCommandsHandler
       executed.add(label);
 	}	
 	
-	public List<String> disabledCommands()
+	public Set<String> disabledCommands()
 	{
-      return new ArrayList<String>(executed);
+      return executed;
 	}	
 }
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 8fc7da3af..5ee3e3123 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -376,9 +376,9 @@ public class Util
 				buf.append(seperator);
 			}
 
-			if (each instanceof List)
+			if (each instanceof Collection)
 			{
-				buf.append(joinList(seperator, ((List)each).toArray()));
+				buf.append(joinList(seperator, ((Collection)each).toArray()));
 			}
 			else
 			{