diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala
index 8e523d45a6..672e4e5398 100644
--- a/akka-actor/src/main/scala/akka/event/Logging.scala
+++ b/akka-actor/src/main/scala/akka/event/Logging.scala
@@ -224,9 +224,9 @@ object LogSource {
  */
 object Logging {
 
-  object Extension extends ExtensionKey[Ext]
+  object Extension extends ExtensionKey[LogExt]
 
-  class Ext(system: ActorSystemImpl) extends Extension {
+  class LogExt(system: ActorSystemImpl) extends Extension {
     private val loggerId = new AtomicInteger
     def id() = loggerId.incrementAndGet()
   }
diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala
index 23f4056dd3..665dc91f83 100644
--- a/akka-remote/src/main/scala/akka/remote/Remote.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remote.scala
@@ -139,7 +139,7 @@ class RemoteSystemDaemon(remote: Remote) extends Actor {
           }
 
         message.getActorPath match {
-          case RemoteActorPath(addr, elems) if addr == remoteAddress && elems.size > 0 ⇒
+          case RemoteActorPath(`remoteAddress`, elems) if elems.size > 0 ⇒
             val name = elems.last
             systemImpl.provider.actorFor(systemImpl.lookupRoot, elems.dropRight(1)) match {
               case x if x eq system.deadLetters ⇒
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index cc698631e4..fc33c1a3c5 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -81,6 +81,7 @@ object AkkaBuild extends Build {
     id = "akka-remote",
     base = file("akka-remote"),
     dependencies = Seq(stm, actorTests % "test->test", testkit % "test->test"),
+    // FIXME re-enable ASAP
     settings = defaultSettings /*++ multiJvmSettings*/ ++ Seq(
       libraryDependencies ++= Dependencies.cluster,
       extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src =>