diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/akka/actor/ActorPath.scala
index 416866a8ee..a9c6784f26 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorPath.scala
@@ -146,6 +146,7 @@ final class ChildActorPath(val parent: ActorPath, val name: String) extends Acto
     }
   }
 
+  // TODO RK investigate Phil’s hash from scala.collection.mutable.HashTable.improve
   override def hashCode: Int = {
     import scala.util.MurmurHash._
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 4b6b9ae839..118e07cd37 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -111,7 +111,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable
    */
   def isTerminated: Boolean
 
-  // FIXME check if we should scramble the bits or whether they can stay the same
+  // FIXME RK check if we should scramble the bits or whether they can stay the same
   override def hashCode: Int = path.hashCode
 
   override def equals(that: Any): Boolean = that match {
@@ -302,7 +302,6 @@ class LocalActorRef private[akka] (
 /**
  * Memento pattern for serializing ActorRefs transparently
  */
-// FIXME: remove and replace by ActorPath.toString
 case class SerializedActorRef(path: String) {
   import akka.serialization.Serialization.currentSystem
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 63b7c74161..3389e413a9 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -29,7 +29,7 @@ object Mailbox {
   final val Scheduled = 4
 
   // mailbox debugging helper using println (see below)
-  // FIXME TODO take this out before release (but please leave in until M2!)
+  // FIXME RK take this out before release (but please leave in until M2!)
   final val debug = false
 }
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 95c3fa2e73..40b1c09864 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -268,7 +268,7 @@ private[akka] case class RemoteActorRef private[akka] (
   loader: Option[ClassLoader])
   extends InternalActorRef {
 
-  // FIXME
+  // FIXME RK
   def getParent = Nobody
   def getChild(name: Iterable[String]) = Nobody
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index f5802fe8ee..b412fcdf3e 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -647,7 +647,7 @@ class RemoteServerHandler(
         instruction.getCommandType match {
           case CommandType.CONNECT if UsePassiveConnections ⇒
             val origin = instruction.getOrigin
-            // FIXME need to include system-name in remote protocol
+            // FIXME RK need to include system-name in remote protocol
             val inbound = RemoteAddress("BORKED", origin.getHostname, origin.getPort)
             val client = new PassiveRemoteClient(event.getChannel, remoteSupport, inbound)
             remoteSupport.bindClient(inbound, client)
@@ -667,7 +667,7 @@ class RemoteServerHandler(
 
   private def getClientAddress(c: Channel): Option[RemoteAddress] =
     c.getRemoteAddress match {
-      case inet: InetSocketAddress ⇒ Some(RemoteAddress("BORKED", inet.getHostName, inet.getPort)) // FIXME Broken!
+      case inet: InetSocketAddress ⇒ Some(RemoteAddress("BORKED", inet.getHostName, inet.getPort)) // FIXME RK Broken!
       case _                       ⇒ None
     }
 }