diff --git a/project/Build.scala b/project/Build.scala
index 23c3cdd9a..9eb340b5a 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -13,7 +13,8 @@ object MainBuild extends Build {
             organization := BuildSettings.organization,
             scalaVersion := Dependencies.Versions.scala,
            scalacOptions ++= BuildSettings.compilerFlags,
-              crossPaths := false,
+              crossPaths := true,
+      crossScalaVersions := Seq(Dependencies.Versions.scala),
            sourcesInBase := false,
               exportJars := true,   // Needed for one-jar, with multi-project
        externalResolvers := BuildSettings.resolvers,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 837426a3b..654adaba1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -16,9 +16,9 @@ object Dependencies {
 
   import Versions._
 
-  val akkaActor       = "com.typesafe.akka" % "akka-actor_2.11" % akka
-  val akkaSlf4j       = "com.typesafe.akka" % "akka-slf4j_2.11" % akka
-  val akkaTestkit     = "com.typesafe.akka" % "akka-testkit_2.11" % akka
+  val akkaActor       = "com.typesafe.akka" %% "akka-actor" % akka
+  val akkaSlf4j       = "com.typesafe.akka" %% "akka-slf4j" % akka
+  val akkaTestkit     = "com.typesafe.akka" %% "akka-testkit" % akka
   val awsCloudWatch   = "com.amazonaws" % "aws-java-sdk-cloudwatch" % aws
   val awsCore         = "com.amazonaws" % "aws-java-sdk-core" % aws
   val awsEC2          = "com.amazonaws" % "aws-java-sdk-ec2" % aws
@@ -33,7 +33,7 @@ object Dependencies {
   val jacksonCore2    = "com.fasterxml.jackson.core" % "jackson-core" % jackson
   val jacksonJoda2    = "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jackson
   val jacksonMapper2  = "com.fasterxml.jackson.core" % "jackson-databind" % jackson
-  val jacksonScala2   = "com.fasterxml.jackson.module" % "jackson-module-scala_2.11" % jackson
+  val jacksonScala2   = "com.fasterxml.jackson.module" %% "jackson-module-scala" % jackson
   val jacksonSmile2   = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-smile" % jackson
   val jodaConvert     = "org.joda" % "joda-convert" % "1.8.1"
   val jol             = "org.openjdk.jol" % "jol-core" % "0.5"
@@ -45,9 +45,9 @@ object Dependencies {
   val scalaCompiler   = "org.scala-lang" % "scala-compiler" % scala
   val scalaLibrary    = "org.scala-lang" % "scala-library" % scala
   val scalaLibraryAll = "org.scala-lang" % "scala-library-all" % scala
-  val scalaLogging    = "com.typesafe.scala-logging" % "scala-logging_2.11" % "3.4.0"
+  val scalaLogging    = "com.typesafe.scala-logging" %% "scala-logging" % "3.4.0"
   val scalaReflect    = "org.scala-lang" % "scala-reflect" % scala
-  val scalatest       = "org.scalatest" % "scalatest_2.11" % "2.2.6"
+  val scalatest       = "org.scalatest" %% "scalatest" % "2.2.6"
   val slf4jApi        = "org.slf4j" % "slf4j-api" % slf4j
   val slf4jLog4j      = "org.slf4j" % "slf4j-log4j12" % slf4j
   val slf4jSimple     = "org.slf4j" % "slf4j-simple" % slf4j
@@ -55,9 +55,9 @@ object Dependencies {
   val spectatorLog4j  = "com.netflix.spectator" % "spectator-ext-log4j2" % spectator
   val spectatorM2     = "com.netflix.spectator" % "spectator-reg-metrics2" % spectator
   val spectatorSandbox= "com.netflix.spectator" % "spectator-ext-sandbox" % spectator
-  val sprayCan        = "io.spray" % "spray-can_2.11" % spray
-  val sprayClient     = "io.spray" % "spray-client_2.11" % spray
-  val sprayRouting    = "io.spray" % "spray-routing_2.11" % spray
-  val sprayTestkit    = "io.spray" % "spray-testkit_2.11" % spray
+  val sprayCan        = "io.spray" %% "spray-can" % spray
+  val sprayClient     = "io.spray" %% "spray-client" % spray
+  val sprayRouting    = "io.spray" %% "spray-routing" % spray
+  val sprayTestkit    = "io.spray" %% "spray-testkit" % spray
   val typesafeConfig  = "com.typesafe" % "config" % "1.3.0"
 }