diff --git a/build.sbt b/build.sbt
index 359c39a0bcd372b0d337eb80c11760c95a792b6f..7e9d71fef0e39c6aa7a09ebafef67664f037f702 100644
--- a/build.sbt
+++ b/build.sbt
@@ -25,7 +25,7 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release
 libraryDependencies ++= Seq(
     "org.scala-lang" % "scala-compiler" % "2.10.2",
     "org.scalatest" %% "scalatest" % "1.9.1" excludeAll(ExclusionRule(organization="org.scala-lang")),
-    "com.typesafe.akka" %% "akka-actor" % "2.1.4"
+    "com.typesafe.akka" %% "akka-actor" % "2.2.0"
 )
 
 fork in run := true
diff --git a/project/Build.scala b/project/Build.scala
index 02a430d7676d6eefb5da891ef602f213b77de7b2..6cead39eb4e6e866554d617a6247a61a54678b94 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -75,7 +75,7 @@ object Leon extends Build {
   }
 
   def genRunnerTask(taskName: String, file: File, name: String, mainClass: String) = {
-    TaskKey[Unit](taskName, "Generate the " + name + " Bash script") <<= (streams, setupScriptTask) map { (s, cps) =>
+    TaskKey[Unit](taskName, "Generate the " + name + " Bash script") <<= (streams, setupScriptTask, resourceDirectory in Compile) map { (s, cps, res) =>
       try {
         // Paths discovery
         if(file.exists) {
@@ -89,7 +89,7 @@ object Leon extends Build {
         fw.write("#!/bin/bash --posix" + nl)
 
         fw.write("SCALACLASSPATH=\"")
-        fw.write(cps.mkString(":"))
+        fw.write((res.getAbsolutePath +: cps).mkString(":"))
         fw.write("\"" + nl + nl)
 
         fw.write("source "+setupScriptFile.getAbsolutePath()+nl)
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
new file mode 100644
index 0000000000000000000000000000000000000000..51fdc6c2c4717c3f40ec017b385bc57af417884a
--- /dev/null
+++ b/src/main/resources/application.conf
@@ -0,0 +1,3 @@
+akka {
+    "log-dead-letters-during-shutdown": false
+}