diff --git a/akka-actor/src/main/scala/akka/event/EventBusJavaAPI.scala b/akka-actor/src/main/scala/akka/event/EventBusJavaAPI.scala
new file mode 100644
index 0000000000..62b39e0c58
--- /dev/null
+++ b/akka-actor/src/main/scala/akka/event/EventBusJavaAPI.scala
@@ -0,0 +1,9 @@
+package akka.event
+
+/*
+ * Created by IntelliJ IDEA.
+ * User: viktorklang
+ * Date: 10/12/11
+ * Time: 9:14 AM
+ */
+public scala class  { }
\ No newline at end of file
diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala
index b8d776e1a2..7b0638c5a2 100644
--- a/akka-actor/src/main/scala/akka/util/Index.scala
+++ b/akka-actor/src/main/scala/akka/util/Index.scala
@@ -6,8 +6,8 @@ package akka.util
 
 import annotation.tailrec
 
-import java.util.{ Set ⇒ JSet }
 import java.util.concurrent.{ ConcurrentSkipListSet, ConcurrentHashMap }
+import java.util.{ Comparator, Set ⇒ JSet }
 
 /**
  * An implementation of a ConcurrentMultiMap
@@ -16,8 +16,8 @@ import java.util.concurrent.{ ConcurrentSkipListSet, ConcurrentHashMap }
  *
  * @author Viktor Klang
  */
-class Index[K, V] {
-  private val container = new ConcurrentHashMap[K, JSet[V]]
+class Index[K, V](val mapSize: Int, val valueComparator: Comparator[V]) {
+  private val container = new ConcurrentHashMap[K, JSet[V]](mapSize)
   private val emptySet = new ConcurrentSkipListSet[V]
 
   /**
@@ -41,7 +41,7 @@ class Index[K, V] {
           }
         }
       } else {
-        val newSet = new ConcurrentSkipListSet[V]
+        val newSet = new ConcurrentSkipListSet[V](valueComparator)
         newSet add v
 
         // Parry for two simultaneous putIfAbsent(id,newSet)
@@ -172,4 +172,4 @@ class Index[K, V] {
  *
  * @author Viktor Klang
  */
-class ConcurrentMultiMap[K, V] extends Index[K, V]
+class ConcurrentMultiMap[K, V](mapSize: Int, valueComparator: Comparator[V]) extends Index[K, V](mapSize, valueComparator)