3 files changed, 6 insertions, 6 deletions
diff --git a/cask/src/cask/internal/DispatchTrie.scala b/cask/src/cask/internal/DispatchTrie.scala
index 952c39b..9f1a9c3 100644
--- a/cask/src/cask/internal/DispatchTrie.scala
+++ b/cask/src/cask/internal/DispatchTrie.scala
@@ -2,10 +2,10 @@ package cask.internal
 import collection.mutable
 object DispatchTrie{
   def construct[T](index: Int,
-                   inputs: Seq[(IndexedSeq[String], T, Boolean)]): DispatchTrie[T] = {
-    val continuations = mutable.Map.empty[String, mutable.Buffer[(IndexedSeq[String], T, Boolean)]]
+                   inputs: collection.Seq[(collection.IndexedSeq[String], T, Boolean)]): DispatchTrie[T] = {
+    val continuations = mutable.Map.empty[String, mutable.Buffer[(collection.IndexedSeq[String], T, Boolean)]]
 
-    val terminals = mutable.Buffer.empty[(IndexedSeq[String], T, Boolean)]
+    val terminals = mutable.Buffer.empty[(collection.IndexedSeq[String], T, Boolean)]
 
     for((path, endPoint, allowSubpath) <- inputs) {
       if (path.length < index) () // do nothing
diff --git a/cask/src/cask/internal/Router.scala b/cask/src/cask/internal/Router.scala
index 64af4cd..4b11811 100644
--- a/cask/src/cask/internal/Router.scala
+++ b/cask/src/cask/internal/Router.scala
@@ -65,7 +65,7 @@ object Router{
         }
       }
 
-      if (missing.nonEmpty || unknown.nonEmpty) Result.Error.MismatchedArguments(missing, unknown.toSeq)
+      if (missing.nonEmpty || unknown.nonEmpty) Result.Error.MismatchedArguments(missing.toSeq, unknown.toSeq)
       else {
         try invoke0(
           target,
diff --git a/cask/src/cask/internal/Util.scala b/cask/src/cask/internal/Util.scala
index 431944a..3f7ab61 100644
--- a/cask/src/cask/internal/Util.scala
+++ b/cask/src/cask/internal/Util.scala
@@ -61,7 +61,7 @@ object Util {
     *
     * Written imperatively for performance since it's used all over the place.
     */
-  def splitPath(p: String): IndexedSeq[String] = {
+  def splitPath(p: String): collection.IndexedSeq[String] = {
     val pLength = p.length
     var i = 0
     while(i < pLength && p(i) == '/') i += 1
@@ -92,7 +92,7 @@ object Util {
     trace.toString
   }
   def softWrap(s: String, leftOffset: Int, maxWidth: Int) = {
-    val oneLine = s.lines.mkString(" ").split(' ')
+    val oneLine = s.linesIterator.mkString(" ").split(' ')
 
     lazy val indent = " " * leftOffset