Almost fixed everything after moving to akka stream 0.7