Sbt-related fixes