diff --git a/example/src/main/scala/org/ensime/noddy/NoddyPlugin.scala b/example/src/main/scala/org/ensime/noddy/NoddyPlugin.scala
index dab7a93..9bd1fc3 100644
--- a/example/src/main/scala/org/ensime/noddy/NoddyPlugin.scala
+++ b/example/src/main/scala/org/ensime/noddy/NoddyPlugin.scala
@@ -2,7 +2,6 @@
 // License: http://www.apache.org/licenses/LICENSE-2.0
 package org.ensime.noddy
 
-import scala.collection.breakOut
 import scala.reflect.internal.ModifierFlags
 import scala.reflect.internal.util._
 import scala.tools.nsc._
@@ -231,11 +230,11 @@ class NoddyPlugin(override val global: Global) extends Plugin {
       case t: PackageDef if hasNoddyClasses(t) =>
         val classes: Map[TypeName, ClassDef] = t.stats.collect {
           case c: ClassDef => c.name -> c
-        }(breakOut)
+        }.toMap
 
         val companions: Map[TermName, ModuleDef] = t.stats.collect {
           case m: ModuleDef => m.name -> m
-        }(breakOut)
+        }.toMap
 
         object ClassNoCompanion {
           def unapply(t: Tree): Option[ClassDef] = t match {
diff --git a/pcplod/src/main/scala/org/ensime/pcplod/PcPlod.scala b/pcplod/src/main/scala/org/ensime/pcplod/PcPlod.scala
index d6e1fb4..0f3a286 100644
--- a/pcplod/src/main/scala/org/ensime/pcplod/PcPlod.scala
+++ b/pcplod/src/main/scala/org/ensime/pcplod/PcPlod.scala
@@ -84,7 +84,7 @@ class PcPlod(
           PcMessageSeverity.Error
       }
       PcMessage(info.pos.source.file.toString, severity, info.msg)
-    }(collection.breakOut)
+    }.toList
   }
 
   def unloadScala(res: String): Unit = {