More classpath/sbt fixes