sbt-assembly fixes