diff --git a/tasks-standard/src/main/scala/sbt/Action.scala b/tasks-standard/src/main/scala/sbt/Action.scala
index b46b864b5..de2d9f3c2 100644
--- a/tasks-standard/src/main/scala/sbt/Action.scala
+++ b/tasks-standard/src/main/scala/sbt/Action.scala
@@ -71,9 +71,9 @@ final case class Info[T](attributes: AttributeMap = AttributeMap.empty, post: T
   def description = attributes.get(Description)
   def setName(n: String) = set(Name, n)
   def setDescription(d: String) = set(Description, d)
-  def set[T](key: AttributeKey[T], value: T) = copy(attributes = this.attributes.put(key, value))
-  def get[T](key: AttributeKey[T]) = attributes.get(key)
-  def postTransform[A](f: (T, AttributeMap) => AttributeMap) = copy(post = (t: T) => f(t, post(t)))
+  def set[A](key: AttributeKey[A], value: A) = copy(attributes = this.attributes.put(key, value))
+  def get[A](key: AttributeKey[A]) = attributes.get(key)
+  def postTransform(f: (T, AttributeMap) => AttributeMap) = copy(post = (t: T) => f(t, post(t)))
 
   override def toString = if (attributes.isEmpty) "_" else attributes.toString
 }
diff --git a/tasks-standard/src/main/scala/sbt/std/Streams.scala b/tasks-standard/src/main/scala/sbt/std/Streams.scala
index 064ac8d7b..3246be73a 100644
--- a/tasks-standard/src/main/scala/sbt/std/Streams.scala
+++ b/tasks-standard/src/main/scala/sbt/std/Streams.scala
@@ -65,8 +65,8 @@ sealed trait TaskStreams[Key] {
   private[this] def getID(s: Option[String]) = s getOrElse default
 }
 sealed trait ManagedStreams[Key] extends TaskStreams[Key] {
-  def open()
-  def close()
+  def open(): Unit
+  def close(): Unit
   def isClosed: Boolean
 }
 
diff --git a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala
index 0d6085dfc..d3f59100c 100644
--- a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala
+++ b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala
@@ -132,7 +132,7 @@ trait TaskExtra {
     def mapFailure[T](f: Incomplete => T): Task[T] = mapR(f compose failM)
 
     def andFinally(fin: => Unit): Task[S] = mapR(x => Result.tryValue[S]({ fin; x }))
-    def doFinally(t: Task[Unit]): Task[S] = flatMapR(x => t.mapR { tx => Result.tryValues[S](tx :: Nil, x) })
+    def doFinally(t: Task[Unit]): Task[S] = flatMapR(x => t.result.map { tx => Result.tryValues[S](tx :: Nil, x) })
     def ||[T >: S](alt: Task[T]): Task[T] = flatMapR { case Value(v) => task(v); case Inc(i) => alt }
     def &&[T](alt: Task[T]): Task[T] = flatMap(_ => alt)
   }
diff --git a/tasks-standard/src/test/scala/TaskRunnerCircular.scala b/tasks-standard/src/test/scala/TaskRunnerCircular.scala
index 81ce0ce14..ee89295b3 100644
--- a/tasks-standard/src/test/scala/TaskRunnerCircular.scala
+++ b/tasks-standard/src/test/scala/TaskRunnerCircular.scala
@@ -34,5 +34,5 @@ object TaskRunnerCircularTest extends Properties("TaskRunner Circular") {
       try { tryRun(top, true, workers); false }
       catch { case i: Incomplete => cyclic(i) }
     }
-  def cyclic(i: Incomplete) = Incomplete.allExceptions(i).exists(_.isInstanceOf[Execute[Task]#CyclicException[_]])
-}
\ No newline at end of file
+  def cyclic(i: Incomplete) = Incomplete.allExceptions(i).exists(_.isInstanceOf[Execute[({ type A[_] <: AnyRef})#A]#CyclicException[_]])
+}
diff --git a/tasks-standard/src/test/scala/TaskSerial.scala b/tasks-standard/src/test/scala/TaskSerial.scala
index 3480ec8b3..d31cf0d21 100644
--- a/tasks-standard/src/test/scala/TaskSerial.scala
+++ b/tasks-standard/src/test/scala/TaskSerial.scala
@@ -15,7 +15,7 @@ import java.util.concurrent.{ CountDownLatch, TimeUnit }
 
 object TaskSerial extends Properties("task serial") {
   val checkCycles = true
-  val Timeout = 100 // in milliseconds
+  val Timeout = 100L // in milliseconds
 
   def eval[T](t: Task[T]): T = tryRun(t, checkCycles, limitTotal(MaxWorkers))