diff --git a/akka-core/src/main/scala/stm/Vector.scala b/akka-core/src/main/scala/stm/Vector.scala
index b76281b909..a526906115 100644
--- a/akka-core/src/main/scala/stm/Vector.scala
+++ b/akka-core/src/main/scala/stm/Vector.scala
@@ -326,7 +326,7 @@ object Vector {
   @inline
   private[stm] def array(elems: AnyRef*) = {
     val back = new Array[AnyRef](elems.length)
-    Array.copy(elems, 0, back, 0, back.length)
+    Array.copy(elems.toArray, 0, back, 0, back.length)
 
     back
   }
diff --git a/akka-core/src/test/scala/VectorBugTestSuite.scala b/akka-core/src/test/scala/VectorBugTestSuite.scala
new file mode 100644
index 0000000000..658ace3681
--- /dev/null
+++ b/akka-core/src/test/scala/VectorBugTestSuite.scala
@@ -0,0 +1,17 @@
+package se.scalablesolutions.akka.stm
+
+import org.scalatest.FunSuite
+import Transaction.Global._
+
+class TransactionalVectorBugTestSuite extends FunSuite {
+
+  test("adding more than 32 items to a Vector shouldn't blow it up") {
+    atomic {
+      var v1 = new Vector[Int]()
+      for (i <- 0 to 31) {
+        v1 = v1 + i
+      }
+      v1 = v1 + 32
+    }
+  }
+}
diff --git a/akka-kernel/src/main/resources/jndi.properties b/akka-kernel/src/main/resources/jndi.properties
deleted file mode 100644
index 3485823a1e..0000000000
--- a/akka-kernel/src/main/resources/jndi.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.naming.factory.initial=com.sun.enterprise.naming.SerialInitContextFactory
\ No newline at end of file
diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
index 186157b576..97307dde17 100644
--- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
+++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
@@ -192,7 +192,7 @@ class MongoStorageSpec extends TestCase {
     assertTrue(l.map(_._1).contains("3"))
     assertTrue(l.map(_._1).contains("4"))
 
-    val JsString(str) = l.filter(_._1 == "2").first._2
+    val JsString(str) = l.filter(_._1 == "2").head._2
     assertEquals(str, "peter")
 
     // trying to fetch for a non-existent transaction will throw
diff --git a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala
index af79ecf5df..e0344ae4fb 100644
--- a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala
+++ b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala
@@ -50,7 +50,7 @@ class SupervisionBeanDefinitionParserTest extends Spec with ShouldMatchers {
       val supervised = builder.getBeanDefinition.getPropertyValues.getPropertyValue("supervised").getValue.asInstanceOf[List[ActiveObjectProperties]]
       assert(supervised != null)
       expect(3) { supervised.length }
-      val iterator = supervised.elements
+      val iterator = supervised.iterator
       expect("foo.bar.Foo") { iterator.next.target }
       expect("foo.bar.Bar") { iterator.next.target }
       expect("foo.bar.MyPojo") { iterator.next.target }