Final fixes for pure sbt project