diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
index 5125611498..80563b679f 100644
--- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
+++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
@@ -1,3 +1,7 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+
 package akka.actor;
 
 import akka.actor.ActorSystem;
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index 7c8cb8948d..11f616bf6c 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -1037,4 +1037,4 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
   }
 
   def checkType[A: Manifest, B](in: Future[A], refmanifest: Manifest[B]): Boolean = manifest[A] == refmanifest
-}
+}
\ No newline at end of file
diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index 94997a49de..28802d1918 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -35,4 +35,4 @@ class ByteStringSpec extends WordSpec with MustMatchers with Checkers {
       "dropping" in { check((a: ByteString, b: ByteString) ⇒ (a ++ b).drop(a.size) == b) }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/akka-actor-tests/src/test/scala/akka/util/NonFatalSpec.scala b/akka-actor-tests/src/test/scala/akka/util/NonFatalSpec.scala
index 0c4bc295fb..4c33c80b68 100644
--- a/akka-actor-tests/src/test/scala/akka/util/NonFatalSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/NonFatalSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.util
+/*package akka.util
 
 import org.scalatest.matchers.MustMatchers
 import akka.testkit.AkkaSpec
@@ -59,4 +59,4 @@ class NonFatalSpec extends AkkaSpec with MustMatchers {
 
   }
 
-}
\ No newline at end of file
+}*/ 
\ No newline at end of file
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index a3d4639941..7f01f2fbe0 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -4,6 +4,8 @@
 
 package akka.actor
 
+import language.existentials
+
 import akka.dispatch._
 import scala.annotation.tailrec
 import java.util.concurrent.TimeUnit
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
index 93a26c6289..0740d8724e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
@@ -2,6 +2,9 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.actor
+
+import language.implicitConversions
+
 import java.util.regex.Pattern
 import akka.util.Helpers
 
diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index 50c769e156..7b21848e13 100644
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.scala
@@ -3,6 +3,8 @@
  */
 package akka.actor
 
+import language.implicitConversions
+
 import akka.util._
 
 import scala.collection.mutable
diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
index 27a9f346db..ccc8ce30ff 100644
--- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
@@ -3,6 +3,8 @@
  */
 package akka.actor
 
+import language.implicitConversions
+
 import java.util.concurrent.TimeUnit
 import scala.collection.mutable.ArrayBuffer
 import scala.collection.JavaConversions._
diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala
index 07af4213fc..e87f9f5119 100644
--- a/akka-actor/src/main/scala/akka/actor/IO.scala
+++ b/akka-actor/src/main/scala/akka/actor/IO.scala
@@ -3,6 +3,9 @@
  */
 package akka.actor
 
+import language.higherKinds
+import language.postfixOps
+
 import akka.dispatch.{ Future, ExecutionContext }
 import akka.util.{ ByteString, Duration, NonFatal }
 import java.net.{ SocketAddress, InetSocketAddress }
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 45b21d3445..3f21801200 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -4,6 +4,8 @@
 
 package akka.actor
 
+import language.existentials
+
 import akka.dispatch._
 import akka.japi.Creator
 import scala.reflect.ClassTag
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index e7c1a03631..76750b816e 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -1,8 +1,9 @@
-package akka.actor
-
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
+package akka.actor
+
+import language.existentials
 
 import akka.japi.{ Creator, Option ⇒ JOption }
 import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
diff --git a/akka-actor/src/main/scala/akka/actor/package.scala b/akka-actor/src/main/scala/akka/actor/package.scala
index 3bf56b8bc4..deb9f0e7a9 100644
--- a/akka-actor/src/main/scala/akka/actor/package.scala
+++ b/akka-actor/src/main/scala/akka/actor/package.scala
@@ -4,6 +4,8 @@
 
 package akka
 
+import language.implicitConversions
+
 package object actor {
   implicit def actorRef2Scala(ref: ActorRef): ScalaActorRef = ref.asInstanceOf[ScalaActorRef]
   implicit def scala2ActorRef(ref: ScalaActorRef): ActorRef = ref.asInstanceOf[ActorRef]
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 7b31a2369e..6ad3a4ccc3 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -4,6 +4,10 @@
 
 package akka.dispatch
 
+import language.implicitConversions
+import language.postfixOps
+import language.higherKinds
+
 import akka.event.Logging.Error
 import scala.Option
 import akka.japi.{ Function ⇒ JFunc, Option ⇒ JOption }
diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala
index 172cf052ca..34bfcaf507 100644
--- a/akka-actor/src/main/scala/akka/event/EventStream.scala
+++ b/akka-actor/src/main/scala/akka/event/EventStream.scala
@@ -3,6 +3,8 @@
  */
 package akka.event
 
+import language.implicitConversions
+
 import akka.actor.{ ActorRef, ActorSystem }
 import akka.event.Logging.simpleName
 import akka.util.Subclassification
diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala
index 17e80d7238..d11ec735f9 100644
--- a/akka-actor/src/main/scala/akka/event/Logging.scala
+++ b/akka-actor/src/main/scala/akka/event/Logging.scala
@@ -3,6 +3,8 @@
  */
 package akka.event
 
+import language.existentials
+
 import akka.actor._
 import akka.{ ConfigurationException, AkkaException }
 import akka.actor.ActorSystem.Settings
@@ -722,7 +724,7 @@ object Logging {
    * logger.
    */
   class DefaultLogger extends Actor with StdOutLogger {
-    def receive = {
+    override def receive: Receive = {
       case InitializeLogger(_) ⇒ sender ! LoggerInitialized
       case event: LogEvent     ⇒ print(event)
     }
diff --git a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
index 337815eed1..03739de894 100644
--- a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
+++ b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
@@ -3,6 +3,8 @@
  */
 package akka.event
 
+import language.existentials
+
 import akka.actor.Actor.Receive
 import akka.actor.ActorContext
 import akka.actor.ActorCell
diff --git a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
index 684c195964..9a078f22db 100644
--- a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
+++ b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
@@ -4,6 +4,8 @@
 
 package akka.japi
 
+import language.implicitConversions
+
 import scala.Some
 import scala.reflect.ClassTag
 
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index c66fa4178d..d029972d3e 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
@@ -3,6 +3,8 @@
  */
 package akka.pattern
 
+import language.implicitConversions
+
 import java.util.concurrent.TimeoutException
 import annotation.tailrec
 import akka.actor._
diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
index d73e146dfb..f8111b0e25 100644
--- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
@@ -3,6 +3,8 @@
  */
 package akka.pattern
 
+import language.implicitConversions
+
 import akka.dispatch.Future
 import akka.actor.{ Status, ActorRef }
 
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index bcd92794da..16b7cdab9f 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -3,6 +3,9 @@
  */
 package akka.routing
 
+import language.implicitConversions
+import language.postfixOps
+
 import akka.actor._
 import akka.util.Duration
 import akka.util.duration._
diff --git a/akka-actor/src/main/scala/akka/util/Duration.scala b/akka-actor/src/main/scala/akka/util/Duration.scala
index cf3d012432..bd7e4baf5d 100644
--- a/akka-actor/src/main/scala/akka/util/Duration.scala
+++ b/akka-actor/src/main/scala/akka/util/Duration.scala
@@ -4,6 +4,8 @@
 
 package akka.util
 
+import language.implicitConversions
+
 import java.util.concurrent.TimeUnit
 import TimeUnit._
 import java.lang.{ Double ⇒ JDouble }
diff --git a/akka-actor/src/main/scala/akka/util/duration/package.scala b/akka-actor/src/main/scala/akka/util/duration/package.scala
index 6a7d28a6e6..dc5b4810a7 100644
--- a/akka-actor/src/main/scala/akka/util/duration/package.scala
+++ b/akka-actor/src/main/scala/akka/util/duration/package.scala
@@ -4,6 +4,8 @@
 
 package akka.util
 
+import language.implicitConversions
+
 import java.util.concurrent.TimeUnit
 //FIXME Needs docs
 package object duration {
diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index 2fe664d7b6..592bf3bd36 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -74,7 +74,7 @@ private[testkit] class CallingThreadDispatcherQueues extends Extension {
     if (queues contains mbox) {
       for {
         ref ← queues(mbox)
-        val q = ref.get
+        q = ref.get
         if (q ne null) && (q ne own)
       } {
         val owner = mbox.actor.self
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 010c5495a5..5895c6465e 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -362,7 +362,7 @@ object AkkaBuild extends Build {
     resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
 
     // compile options
-    scalacOptions ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-unchecked", "-Xlog-reflective-calls") ++ (
+    scalacOptions ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", /*"-deprecation",*/ "-feature", "-unchecked", "-Xlog-reflective-calls") ++ (
       if (true || (System getProperty "java.runtime.version" startsWith "1.7")) Seq() else Seq("-optimize")), // -optimize fails with jdk7
     javacOptions  ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
 
@@ -447,14 +447,9 @@ object Dependencies {
 
   val testkit = Seq(Test.scalatest, Test.junit)
 
-  val actorTests = Seq(
-    Test.junit, Test.scalatest, Test.commonsMath, Test.mockito,
-    Test.scalacheck, protobuf
-  )
+  val actorTests = Seq(Test.junit, Test.scalatest, Test.commonsMath, Test.mockito, Test.scalacheck, protobuf)
 
-  val remote = Seq(
-    netty, protobuf, Test.junit, Test.scalatest
-  )
+  val remote = Seq(netty, protobuf, Test.junit, Test.scalatest)
 
   val cluster = Seq(Test.junit, Test.scalatest)
 
@@ -480,39 +475,26 @@ object Dependencies {
 }
 
 object Dependency {
-
-  // Versions
-
-  object V {
-    val Camel        = "2.8.0"
-    val Logback      = "1.0.4"
-    val Netty        = "3.5.0.Final"
-    val Protobuf     = "2.4.1"
-    val ScalaStm     = "0.5"
-    val Scalatest    = "1.6.1"
-    val Slf4j        = "1.6.4"
-  }
-
   // Compile
-  val config        = "com.typesafe"                % "config"                % "0.4.1"    // ApacheV2
-  val camelCore     = "org.apache.camel"            % "camel-core"            % V.Camel    // ApacheV2
-  val netty         = "io.netty"                    % "netty"                 % V.Netty    // ApacheV2
-  val protobuf      = "com.google.protobuf"         % "protobuf-java"         % V.Protobuf // New BSD
-  val scalaStm      = "org.scala-tools"             %% "scala-stm"            % V.ScalaStm // Modified BSD (Scala)
-  val slf4jApi      = "org.slf4j"                   % "slf4j-api"             % V.Slf4j    // MIT
-  val zeroMQ        = "org.zeromq"                  %% "zeromq-scala-binding" % "0.0.6"    // ApacheV2
+  val config        = "com.typesafe"                % "config"                % "0.4.1"       // ApacheV2
+  val camelCore     = "org.apache.camel"            % "camel-core"            % "2.8.0"       // ApacheV2
+  val netty         = "io.netty"                    % "netty"                 % "3.5.0.Final" // ApacheV2
+  val protobuf      = "com.google.protobuf"         % "protobuf-java"         % "2.4.1"       // New BSD
+  val scalaStm      = "org.scala-tools"             %% "scala-stm"            % "0.5"         // Modified BSD (Scala)
+  val slf4jApi      = "org.slf4j"                   % "slf4j-api"             % "1.6.4"       // MIT
+  val zeroMQ        = "org.zeromq"                  %% "zeromq-scala-binding" % "0.0.6"       // ApacheV2
 
   // Test
 
   object Test {
-    val commonsMath = "org.apache.commons"          % "commons-math"    % "2.1"        % "test" // ApacheV2
-    val commonsIo   = "commons-io"                  % "commons-io"      % "2.0.1"      % "test" // ApacheV2
-    val junit       = "junit"                       % "junit"           % "4.5"        % "test" // Common Public License 1.0
-    val logback     = "ch.qos.logback"              % "logback-classic" % V.Logback    % "test" // EPL 1.0 / LGPL 2.1
-    val mockito     = "org.mockito"                 % "mockito-all"     % "1.8.1"      % "test" // MIT
-    val scalatest   = "org.scalatest"               %% "scalatest"      % V.Scalatest  % "test" // ApacheV2
-    val scalacheck  = "org.scala-tools.testing"     %% "scalacheck"     % "1.9"        % "test" // New BSD
-    val specs2      = "org.specs2"                  %% "specs2"         % "1.9"        % "test" // Modified BSD / ApacheV2
+    val commonsMath = "org.apache.commons"          % "commons-math"          % "2.1"           % "test" // ApacheV2
+    val commonsIo   = "commons-io"                  % "commons-io"            % "2.0.1"         % "test" // ApacheV2
+    val junit       = "junit"                       % "junit"                 % "4.10"          % "test" // Common Public License 1.0
+    val logback     = "ch.qos.logback"              % "logback-classic"       % "1.0.4"         % "test" // EPL 1.0 / LGPL 2.1
+    val mockito     = "org.mockito"                 % "mockito-all"           % "1.8.1"         % "test" // MIT
+    val scalatest   = "org.scalatest"               %% "scalatest"            % "1.8-SNAPSHOT"  % "test" // ApacheV2
+    val scalacheck  = "org.scalacheck"              % "scalacheck_2.10.0-M3"  % "1.10-SNAPSHOT" % "test" // New BSD
+    val specs2      = "org.specs2"                  %% "specs2"               % "1.11"          % "test" // Modified BSD / ApacheV2
   }
 }