Updates from sbt and Dev