Fixes for sbt command