diff --git a/Makefrag b/Makefrag
index 4594c7f5..594ca080 100644
--- a/Makefrag
+++ b/Makefrag
@@ -1,13 +1,13 @@
 ROCKETCHIP_DIR=$(base_dir)/rocket-chip
 
-SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(ROCKETCHIP_DIR)/sbt-launch.jar
+SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(ROCKETCHIP_DIR)/sbt-launch.jar ++2.12.4
 
 lookup_scala_srcs = $(shell find $(1)/ -iname "*.scala" 2> /dev/null)
 
 PACKAGES=rocket-chip testchipip
 SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/src/main/scala)
 
-ROCKET_CLASSES ?= "$(ROCKETCHIP_DIR)/target/scala-2.11/classes:$(ROCKETCHIP_DIR)/chisel3/target/scala-2.11/*"
+ROCKET_CLASSES ?= "$(ROCKETCHIP_DIR)/target/scala-2.12/classes:$(ROCKETCHIP_DIR)/chisel3/target/scala-2.12/*"
 FIRRTL_JAR ?= $(ROCKETCHIP_DIR)/lib/firrtl.jar
 FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(ROCKET_CLASSES):$(FIRRTL_JAR) firrtl.Driver
 
diff --git a/build.sbt b/build.sbt
index 1cc3a955..5e8e7e01 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,9 +1,9 @@
 lazy val commonSettings = Seq(
   organization := "edu.berkeley.cs",
   version := "1.0",
-  scalaVersion := "2.11.12",
+  scalaVersion := "2.12.4",
   traceLevel := 15,
-  scalacOptions ++= Seq("-deprecation","-unchecked"),
+  scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
   libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test",
   libraryDependencies += "org.json4s" %% "json4s-native" % "3.5.3",
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
diff --git a/rocket-chip b/rocket-chip
index 95f07a8a..50bb13d7 160000
--- a/rocket-chip
+++ b/rocket-chip
@@ -1 +1 @@
-Subproject commit 95f07a8a8e9b3a8bb7019cdfaa31ac8cbaca8298
+Subproject commit 50bb13d7887e5f9ca192431234b057ae9d8edb6c
diff --git a/src/main/scala/example/Top.scala b/src/main/scala/example/Top.scala
index 758c9ef9..4d74ce48 100644
--- a/src/main/scala/example/Top.scala
+++ b/src/main/scala/example/Top.scala
@@ -10,7 +10,7 @@ import testchipip._
 class ExampleTop(implicit p: Parameters) extends RocketSubsystem
     with CanHaveMasterAXI4MemPort
     with HasPeripheryBootROM
-    with HasSystemErrorSlave
+//  with HasSystemErrorSlave
     with HasSyncExtInterrupts
     with HasNoDebug
     with HasPeripherySerial {
diff --git a/testchipip b/testchipip
index 8bf7e85c..5aebd3a4 160000
--- a/testchipip
+++ b/testchipip
@@ -1 +1 @@
-Subproject commit 8bf7e85ceb8a33ecca4234ab8edfca4206bc665b
+Subproject commit 5aebd3a48d029c2b6fa9d2809f35fa21a14d7311