Wip/fix sbt server merge

Make the sbt-server branch working properly.