Straightened out more sbt stuff