diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
index e9ab0fccf1..bcf9d03be4 100644
--- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
+++ b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
@@ -17,7 +17,7 @@ import java.util.LinkedList;
 import java.lang.Iterable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import static akka.japi.Util.manifest;
+import static akka.japi.Util.classTag;
 
 import akka.testkit.AkkaSpec;
 
@@ -287,7 +287,7 @@ public class JavaFutureTests {
   @Test
   public void mapToMustBeCallable() throws Exception {
     Promise<Object> p = Futures.promise(system.dispatcher());
-    Future<String> f = p.future().mapTo(manifest(String.class));
+    Future<String> f = p.future().mapTo(classTag(String.class));
     Duration d = Duration.create(1, TimeUnit.SECONDS);
     p.success("foo");
     Await.ready(p, d);
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 6ad3a4ccc3..ca6e5bf3cb 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -27,7 +27,7 @@ import java.util.concurrent.{ ExecutionException, Callable, TimeoutException }
 import java.util.concurrent.atomic.{ AtomicInteger }
 import akka.pattern.AskTimeoutException
 import scala.util.DynamicVariable
-import scala.runtime.BoxedUnit
+import scala.runtime.{ BoxedUnit, AbstractPartialFunction }
 
 object Await {
 
@@ -952,7 +952,7 @@ final class KeptPromise[T](suppliedValue: Either[Throwable, T])(implicit val exe
  */
 object japi {
   @deprecated("Do not use this directly, use subclasses of this", "2.0")
-  class CallbackBridge[-T] extends PartialFunction[T, BoxedUnit] {
+  class CallbackBridge[-T] extends AbstractPartialFunction[T, BoxedUnit] {
     override final def isDefinedAt(t: T): Boolean = true
     override final def apply(t: T): BoxedUnit = {
       internal(t)
@@ -962,7 +962,7 @@ object japi {
   }
 
   @deprecated("Do not use this directly, use 'Recover'", "2.0")
-  class RecoverBridge[+T] extends PartialFunction[Throwable, T] {
+  class RecoverBridge[+T] extends AbstractPartialFunction[Throwable, T] {
     override final def isDefinedAt(t: Throwable): Boolean = true
     override final def apply(t: Throwable): T = internal(t)
     protected def internal(result: Throwable): T = null.asInstanceOf[T]
@@ -976,10 +976,11 @@ object japi {
 
   @deprecated("Do not use this directly, use subclasses of this", "2.0")
   class UnitFunctionBridge[-T] extends (T ⇒ BoxedUnit) {
-    override final def apply(t: T): BoxedUnit = {
-      internal(t)
-      BoxedUnit.UNIT
-    }
+    final def apply$mcLJ$sp(l: Long): BoxedUnit = { internal(l.asInstanceOf[T]); BoxedUnit.UNIT }
+    final def apply$mcLI$sp(i: Int): BoxedUnit = { internal(i.asInstanceOf[T]); BoxedUnit.UNIT }
+    final def apply$mcLF$sp(f: Float): BoxedUnit = { internal(f.asInstanceOf[T]); BoxedUnit.UNIT }
+    final def apply$mcLD$sp(d: Double): BoxedUnit = { internal(d.asInstanceOf[T]); BoxedUnit.UNIT }
+    override final def apply(t: T): BoxedUnit = { internal(t); BoxedUnit.UNIT }
     protected def internal(result: T): Unit = ()
   }
 }
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index 7355e4f7fb..dab7700fe3 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@@ -145,7 +145,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
    */
   private[akka] val bindings: Seq[ClassSerializer] = {
     val configuredBindings = for ((k: String, v: String) ← settings.SerializationBindings if v != "none") yield {
-      val c = system.dynamicAccess.getClassFor(k).fold(throw _, identity[Class[_]])
+      val c = system.dynamicAccess.getClassFor[Any](k).fold(throw _, identity[Class[_]])
       (c, serializers(v))
     }
     sort(configuredBindings)