Upgrade akka and a little bugfix