diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
index 7e4bef15e..1ca63efbe 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
@@ -47,10 +47,10 @@ private[sbt] object SizeParser {
       .map {
         case (number, unit) =>
           unit match {
-            case None | Some(Bytes) => multiply(number, right = 1)
-            case Some(KiloBytes)    => multiply(number, right = 1024)
-            case Some(MegaBytes)    => multiply(number, right = 1024 * 1024)
-            case Some(GigaBytes)    => multiply(number, right = 1024 * 1024 * 1024)
+            case None | Some(Bytes) => multiply(number, right = 1L)
+            case Some(KiloBytes)    => multiply(number, right = 1024L)
+            case Some(MegaBytes)    => multiply(number, right = 1024L * 1024)
+            case Some(GigaBytes)    => multiply(number, right = 1024L * 1024 * 1024)
           }
       }
 }
diff --git a/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala b/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala
index 14080ccfa..6d105dc3a 100644
--- a/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala
+++ b/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala
@@ -56,8 +56,8 @@ private[sbt] object InMemoryCacheStore {
     override def read[T]()(implicit reader: JsonReader[T]): T = {
       val lastModified = IO.getModifiedTimeOrZero(path.toFile)
       store.get[T](path) match {
-        case Some((value: T, `lastModified`)) => value
-        case _                                => cacheStore.read[T]()
+        case Some((value, `lastModified`)) => value
+        case _                             => cacheStore.read[T]()
       }
     }
     override def write[T](value: T)(implicit writer: JsonWriter[T]): Unit = {