diff --git a/build.sbt b/build.sbt
index f2bddb77c6a..4b4971af6ad 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,7 +15,7 @@ lazy val customUnidocSettings = unidocSettings ++ Seq (
 
 lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
-  version := "3.0-SNAPSHOT_2017-07-17",
+  version := "3.0-SNAPSHOT_2017-07-19",
   git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
   autoAPIMappings := true,
   scalaVersion := "2.11.11",
@@ -65,7 +65,8 @@ lazy val publishSettings = Seq (
       </developer>
     </developers>,
 
-  publishTo <<= version { v: String =>
+  publishTo := {
+    val v = version.value
     val nexus = "https://oss.sonatype.org/"
     if (v.trim.endsWith("SNAPSHOT")) {
       Some("snapshots" at nexus + "content/repositories/snapshots")
@@ -76,7 +77,7 @@ lazy val publishSettings = Seq (
   }
 )
 
-val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-07-17")
+val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-07-19")
 
 lazy val chiselSettings = Seq (
   name := "chisel3",
@@ -95,11 +96,6 @@ lazy val chiselSettings = Seq (
   parallelExecution in Test := true,
 
   javacOptions ++= Seq("-target", "1.7")
-  //  Hopefully we get these options back in Chisel3
-  //  scalacOptions in (Compile, doc) <++= (baseDirectory in LocalProject("chisel"), version) map { (bd, v) =>
-  //    Seq("-diagrams", "-diagrams-max-classes", "25", "-sourcepath", bd.getAbsolutePath, "-doc-source-url",
-  //        "https://github.com/ucb-bar/chisel/tree/master/€{FILE_PATH}.scala")
-  //  }
 )
 
 lazy val coreMacros = (project in file("coreMacros")).
@@ -140,10 +136,10 @@ lazy val chisel = (project in file(".")).
     ),
     aggregate in doc := false,
     // Include macro classes, resources, and sources main JAR.
-    mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
-    mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
-    mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
-    mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc),
+    mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value,
+    mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value,
+    mappings in (Compile, packageBin) ++= (mappings in (chiselFrontend, Compile, packageBin)).value,
+    mappings in (Compile, packageSrc) ++= (mappings in (chiselFrontend, Compile, packageSrc)).value,
     // Export the packaged JAR so projects that depend directly on Chisel project (rather than the
     // published artifact) also see the stuff in coreMacros and chiselFrontend.
     exportJars := true