diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index 40f3ff0320..07b77c7495 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -169,7 +169,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
         stopped map { _ ⇒ () } // RARP needs only type Unit, not a boolean
       case None ⇒
         log.warning("Remoting is not running. Ignoring shutdown attempt.")
-        Future successful ()
+        Future successful (())
     }
   }
 
@@ -463,6 +463,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
   def flushing: Receive = {
     case s: Send               ⇒ forwardToDeadLetters(s)
     case InboundAssociation(h) ⇒ h.disassociate()
+    case Terminated(_)         ⇒ // why should we care now?
   }
 
   private def forwardToDeadLetters(s: Send): Unit = {
@@ -551,4 +552,4 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
     }
   }
 
-}
\ No newline at end of file
+}
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 b465782aa0..9951df6ee8 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -211,7 +211,7 @@ private[akka] class NettyRemoteTransport(_system: ExtendedActorSystem, _provider
         }
       }
     }
-    Future successful ()
+    Future successful (())
   }
 
   def send(
@@ -271,10 +271,7 @@ private[akka] class NettyRemoteTransport(_system: ExtendedActorSystem, _provider
   def shutdownClientConnection(remoteAddress: Address): Unit = {
     clientsLock.writeLock().lock()
     try {
-      remoteClients.remove(remoteAddress) match {
-        case Some(client) ⇒ client.shutdown()
-        case None         ⇒ false
-      }
+      remoteClients.remove(remoteAddress) foreach (_.shutdown())
     } finally {
       clientsLock.writeLock().unlock()
     }
@@ -283,10 +280,7 @@ private[akka] class NettyRemoteTransport(_system: ExtendedActorSystem, _provider
   def restartClientConnection(remoteAddress: Address): Unit = {
     clientsLock.readLock().lock()
     try {
-      remoteClients.get(remoteAddress) match {
-        case Some(client) ⇒ client.connect(reconnectIfAlreadyConnected = true)
-        case None         ⇒ false
-      }
+      remoteClients.get(remoteAddress) foreach (_.connect(reconnectIfAlreadyConnected = true))
     } finally {
       clientsLock.readLock().unlock()
     }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index 78cb7ceaff..398ff6f950 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -386,6 +386,7 @@ private[transport] class ProtocolStateActor(initialData: InitialProtocolStateDat
           case ListenerReady(listener, _) ⇒
             listener notify InboundPayload(payload)
             stay()
+          case msg ⇒ throw new AkkaProtocolException("unhandled message in Open state: " + msg, null)
         }
 
         case _ ⇒ stay()
@@ -398,6 +399,7 @@ private[transport] class ProtocolStateActor(initialData: InitialProtocolStateDat
       val handle = stateData match {
         case ListenerReady(_, wrappedHandle)            ⇒ wrappedHandle
         case AssociatedWaitHandler(_, wrappedHandle, _) ⇒ wrappedHandle
+        case msg                                        ⇒ throw new AkkaProtocolException("unhandled message in Open state: " + msg, null)
       }
       sendDisassociate(handle)
       stop()
diff --git a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
index 76fb8ba0ed..02d9f08433 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
@@ -155,7 +155,7 @@ class TestTransport(
     })
 
   private[akka] def write(handle: TestAssociationHandle, payload: ByteString): Boolean =
-    Await.result(writeBehavior((handle, payload)), 3 seconds)
+    Await.result(writeBehavior((handle, payload)), 3.seconds)
 
   private[akka] def disassociate(handle: TestAssociationHandle): Unit = disassociateBehavior(handle)
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index ee36be8581..5164d6969f 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -333,7 +333,7 @@ private[transport] class ThrottledAssociation(
         if (inboundThrottleMode == Unthrottled && !queue.isEmpty) self ! Dequeue
         else if (!queue.isEmpty) {
           context.system.scheduler.scheduleOnce(
-            inboundThrottleMode.timeToAvailable(System.nanoTime(), queue.head.length) nanoseconds, self, Dequeue)
+            inboundThrottleMode.timeToAvailable(System.nanoTime(), queue.head.length).nanos, self, Dequeue)
         }
       }
       stay()
@@ -376,7 +376,7 @@ private[transport] class ThrottledAssociation(
           queue = queue.enqueue(payload)
 
           context.system.scheduler.scheduleOnce(
-            inboundThrottleMode.timeToAvailable(System.nanoTime(), tokens) nanoseconds, self, Dequeue)
+            inboundThrottleMode.timeToAvailable(System.nanoTime(), tokens).nanos, self, Dequeue)
         }
       } else {
         queue = queue.enqueue(payload)
@@ -419,4 +419,4 @@ private[transport] case class ThrottlerHandle(_wrappedHandle: AssociationHandle,
     throttlerActor ! PoisonPill
   }
 
-}
\ No newline at end of file
+}