diff --git a/common.conf b/common.conf
index 2e0aacd53..a684b264f 100644
--- a/common.conf
+++ b/common.conf
@@ -64,7 +64,7 @@ vars: {
   // "release-0.7" is a stable branch, used to cut 0.7 against new Scala milestones at this time
   scala-stm-ref                : "nbronson/scala-stm.git#release-0.7"
   scalacheck-ref               : "rickynils/scalacheck.git#1.11.6"
-  scalatest-ref                : "scalatest/scalatest.git#2.2.3-and-greater"
+  scalatest-ref                : "adriaanm/scalatest.git#2.2.3-and-greater-cobu"
   // fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
   spire-ref                    : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d"
   # before adding the scoverage 1.3.5 dependency
@@ -85,9 +85,9 @@ vars: {
   scala-partest-ref            : "scala/scala-partest.git"
   scala-partest-interface-ref  : "scala/scala-partest-interface.git"
   scala-xml-ref                : "scala/scala-xml.git"
-  scala-swing-ref              : "scala/scala-swing.git#2.0.x"
+  scala-swing-ref              : "adriaanm/scala-swing.git#2.0.x"
   scala-records-ref            : "scala-records/scala-records.git"
-  slick-ref                    : "slick/slick.git"
+  slick-ref                    : "adriaanm/slick.git#master"
   twitter-util-ref             : "adriaanm/util.git#develop"
   jawn-ref                     : "non/jawn.git"
   mima-ref                     : "lrytz/migration-manager.git#2.12-compat"
@@ -95,7 +95,7 @@ vars: {
   acyclic-ref                  : "lihaoyi/acyclic.git"
   sourcecode-ref               : "lihaoyi/sourcecode.git"
   fastparse-ref                : "lihaoyi/fastparse.git"
-  macro-paradise-ref           : "scalamacros/paradise.git#2.12.x"
+  macro-paradise-ref           : "adriaanm/paradise.git#2.12.x-cobu"
   macro-compat-ref             : "milessabin/macro-compat.git"
 
   specs2-3-ref                 : "adriaanm/specs2.git#community-build-3.6" // "etorreborre/specs2.git#SPECS2-3.6.2"
@@ -112,7 +112,7 @@ vars: {
   scodec-bits-ref              : "adriaanm/scodec-bits.git#dbuild-sam"
   discipline-ref               : "typelevel/discipline.git#v0.2"
   scala-2-12-junit-mixin-plugin-ref : "scala-js/scala-2.12-junit-mixin-plugin.git"
-  scala-js-ref                 : "scala-js/scala-js.git"
+  scala-js-ref                 : "adriaanm/scala-js.git"
   scalamock-ref                : "paulbutcher/scalamock.git"
   scalariform-ref              : "daniel-trinh/scalariform.git"
 
@@ -246,9 +246,7 @@ build += {
     uri:    "https://github.com/"${vars.shapeless-ref}
     extra.projects: ["coreJVM"]
     // optimizer related. Lukas may want to revisit before 2.12 final
-    extra.commands: ${vars.default-commands} [
-      "set scalacOptions -= \"-Xfatal-warnings\""
-    ]
+    extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ]
     extra.run-tests: false // TODO enable tests
   }
 
@@ -349,7 +347,7 @@ build += {
      // since it's just benchmarks and we'd have to add another resolver
      // to get the JMH dependency. - ST 8/17/15
      projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"]
-    run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15
+     run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15
    }
   }
 
@@ -401,14 +399,14 @@ build += {
     extra.projects: ["sbt-testng-interface"]  // just the interface, we don't need to build the plugin
   }
 
-  ${vars.base} {
-    name:   "browse",
-    uri:    "https://github.com/"${vars.browse-ref}
-    extra.commands: ${vars.default-commands} [
-      "set libraryDependencies += \"org.scala-lang.modules\" %% \"scala-xml\" % \"1.0.0-RC6\""
-    ]
-    extra.exclude: ["test", "testLink"]
-  }
+//  ${vars.base} {
+//    name:   "browse",
+//    uri:    "https://github.com/"${vars.browse-ref}
+//    extra.commands: ${vars.default-commands} [
+//      "set libraryDependencies += \"org.scala-lang.modules\" %% \"scala-xml\" % \"1.0.0-RC6\""
+//    ]
+//    extra.exclude: ["test", "testLink"]
+//  }
 
   ${vars.base} {
     name: sbinary
@@ -421,7 +419,7 @@ build += {
   }
 
   ${vars.base} {
-    name: "scala-2.12-junit-mixin-plugin",
+    name: "scala-2-12-junit-mixin-plugin",
     uri:  "http://github.com/"${vars.scala-2-12-junit-mixin-plugin-ref}
   }
 
@@ -481,6 +479,7 @@ build += {
   ${vars.base} {
     name:   "macro-paradise",
     uri:    "http://github.com/"${vars.macro-paradise-ref}
+    extra.run-tests: false // see https://github.com/scala/scala-dev/issues/203
   }
 
   ${vars.base} {
@@ -554,7 +553,7 @@ build += {
     // this isn't really necessary and would pull in a JMH dependency
     extra.exclude: ["util-benchmark"]
     // TODO tests pass in 2.11.x-jdk8, why not here?
-    extra.run-tests: false
+    extra.run-tests: false // https://github.com/scala/scala-dev/issues/203#issuecomment-239649902
   }
 
 ]}