diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index bb4def1821..3d8531cd8b 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -71,7 +71,7 @@ private[akka] object ActorRefInternals {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-trait ActorRef extends ActorRefShared with ForwardableChannel with java.lang.Comparable[ActorRef] with Serializable {
+abstract class ActorRef extends ActorRefShared with ForwardableChannel with java.lang.Comparable[ActorRef] with Serializable {
   scalaRef: ScalaActorRef ⇒
   // Only mutable for RemoteServer in order to maintain identity across nodes
   @volatile
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 1455bbcbdd..a36c21ee57 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -869,8 +869,8 @@ class DefaultPromise[T](val timeout: Timeout) extends Promise[T] {
         this
       } else { //Limited wait
         val time = if (!atMost.isFinite) timeLeft() //If atMost is infinity, use preset timeout
-                   else if (!timeout.duration.isFinite) atMost.toNanos //If preset timeout is infinite, use atMost
-                   else atMost.toNanos min timeLeft() //Otherwise use the smallest of them
+        else if (!timeout.duration.isFinite) atMost.toNanos //If preset timeout is infinite, use atMost
+        else atMost.toNanos min timeLeft() //Otherwise use the smallest of them
         if (awaitUnsafe(time)) this
         else throw new FutureTimeoutException("Future timed out after [" + NANOS.toMillis(time) + "] ms")
       }
diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index aafd0988ee..69a1e35783 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -51,7 +51,7 @@ object MessageDispatcher {
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-trait MessageDispatcher {
+abstract class MessageDispatcher {
 
   import MessageDispatcher._