diff --git a/.travis.yml b/.travis.yml
index 27f5564..d79ac5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M5
+  - 2.13.0-RC1
 jdk:
   - oraclejdk8
   - openjdk11
diff --git a/build.sbt b/build.sbt
index a6041fa..d218ecb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,19 +8,25 @@ scalaVersion := "2.12.8"
 
 scalacOptions += "-feature"
 
-crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-M5")
+crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC1")
 
 resolvers += Resolver.mavenLocal
 
 libraryDependencies ++= Seq(
   "org.apache.solr"         % "solr-solrj"               % "7.1.0",
   "com.squareup.okhttp3"    % "okhttp"                   % "3.9.1",
-  "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
-  "org.scalatest"          %% "scalatest"                % "3.0.6-SNAP4" % "test",
-  "org.mockito"             % "mockito-core"             % "2.2.22"      % "test",
-  "commons-logging"         % "commons-logging"          % "1.2"         % "runtime"
+  "org.scalatest"          %% "scalatest"                % "3.0.8-RC2" % "test",
+  "org.mockito"             % "mockito-core"             % "2.2.22"    % "test",
+  "commons-logging"         % "commons-logging"          % "1.2"       % "runtime"
 )
 
+libraryDependencies ++= PartialFunction.condOpt(CrossVersion.partialVersion(scalaVersion.value)){
+  case Some((2, 11)) =>
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
+  case _ =>
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
+}.toList
+
 publishMavenStyle := true
 
 publishTo := {
diff --git a/src/main/scala/com/github/takezoe/solr/scala/CaseClassMapper.scala b/src/main/scala/com/github/takezoe/solr/scala/CaseClassMapper.scala
index 3bf4835..dbc23cd 100644
--- a/src/main/scala/com/github/takezoe/solr/scala/CaseClassMapper.scala
+++ b/src/main/scala/com/github/takezoe/solr/scala/CaseClassMapper.scala
@@ -76,7 +76,7 @@ private[scala] object CaseClassMapper {
     } else if(clazz == classOf[Float] || clazz == java.lang.Float.TYPE){
       0f
     } else if(clazz == classOf[Long] || clazz == java.lang.Long.TYPE){
-      0l
+      0L
     } else if(clazz == classOf[Char] || clazz == java.lang.Character.TYPE){
       '\u0000'
     } else if(clazz == classOf[Boolean] || clazz == java.lang.Boolean.TYPE){
diff --git a/src/main/scala/com/github/takezoe/solr/scala/QueryBuilderBase.scala b/src/main/scala/com/github/takezoe/solr/scala/QueryBuilderBase.scala
index 07eacff..ce51f85 100644
--- a/src/main/scala/com/github/takezoe/solr/scala/QueryBuilderBase.scala
+++ b/src/main/scala/com/github/takezoe/solr/scala/QueryBuilderBase.scala
@@ -40,7 +40,7 @@ trait QueryBuilderBase[Repr <: QueryBuilderBase[Repr]] {
     copy(newId = id)
   }
 
-  def collection(collection: String) = {
+  def collection(collection: String): Repr = {
     copy(newCollection = collection)
   }
 
@@ -211,7 +211,7 @@ trait QueryBuilderBase[Repr <: QueryBuilderBase[Repr]] {
   }
 
   protected def docToMap(doc: SolrDocument) = {
-    doc.getFieldNames.asScala.map { key ⇒ key → doc.getFieldValue(key) }.toMap
+    doc.getFieldNames.asScala.map { key => key -> doc.getFieldValue(key) }.toMap
   }
 
   protected def responseToMap(response: QueryResponse): MapQueryResult = {
diff --git a/src/main/scala/com/github/takezoe/solr/scala/async/UpdatableInputStream.scala b/src/main/scala/com/github/takezoe/solr/scala/async/UpdatableInputStream.scala
index 7829304..e7ce497 100644
--- a/src/main/scala/com/github/takezoe/solr/scala/async/UpdatableInputStream.scala
+++ b/src/main/scala/com/github/takezoe/solr/scala/async/UpdatableInputStream.scala
@@ -2,8 +2,6 @@ package com.github.takezoe.solr.scala.async
 
 import java.io.{ByteArrayOutputStream, InputStream}
 
-import scala.compat.Platform
-
 /**
  * @author steven
  *
@@ -36,7 +34,7 @@ class UpdatableInputStream extends InputStream {
                 Some(bytes)
             else {
                 val ret = new Array[Byte](max)
-                Platform.arraycopy(bytes, 0, ret, 0, max)
+                java.lang.System.arraycopy(bytes, 0, ret, 0, max)
                 baos.write(bytes, max, bytes.length - max)
                 Some(ret)
             }
@@ -58,9 +56,9 @@ class UpdatableInputStream extends InputStream {
             0
         else {
             dequeue(len) match {
-                case None ⇒ -1
-                case Some(bytes) ⇒
-                    Platform.arraycopy(bytes, 0, b, off, bytes.length)
+                case None => -1
+                case Some(bytes) =>
+                    java.lang.System.arraycopy(bytes, 0, b, off, bytes.length)
                     bytes.length
             }
         }