changes to adapt to Akka 2.2.3