fixed a bunch of bugs introduced during akka removal