diff --git a/src/main/scala/plugin/PluginSystem.scala b/src/main/scala/plugin/PluginSystem.scala
index c12c9cd..153ab6a 100644
--- a/src/main/scala/plugin/PluginSystem.scala
+++ b/src/main/scala/plugin/PluginSystem.scala
@@ -98,8 +98,8 @@
         // Compile and eval Scala source code
         ScalaPlugin.eval(pluginDir.listFiles.filter(_.getName.endsWith(".scala.html")).map { file =>
           ScalaPlugin.compileTemplate(
-            id.replaceAll("-", ""),
-            file.getName.replaceAll("\\.scala\\.html$", ""),
+            id.replace("-", ""),
+            file.getName.stripSuffix(".scala.html"),
             IOUtils.toString(new FileInputStream(file)))
         }.mkString("\n") + source)
 
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index d35ddf0..8740d9e 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -421,7 +421,7 @@
         conditions.get("author").flatMap(_.headOption),
         conditions.get("assignee").flatMap(_.headOption),
         conditions.get("mentions").flatMap(_.headOption),
-        conditions.get("is").getOrElse(Seq.empty).filter(x => x == "open" || x == "closed").headOption.getOrElse("open"),
+        conditions.get("is").getOrElse(Seq.empty).find(x => x == "open" || x == "closed").getOrElse("open"),
         sort,
         direction,
         conditions.get("visibility").flatMap(_.headOption),
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index acbca97..b74ccb4 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -190,7 +190,7 @@
         JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
         repository,
         issues.size,
-        issues.filter(_ == true).size,
+        issues.count(_ == true),
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
@@ -388,4 +388,4 @@
 
   case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
 
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala
index 63f9ad1..74802c6 100644
--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -40,7 +40,7 @@
           props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
           ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
           ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString))
+          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x))
           ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
           ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala
index 5ea43a3..b5e2e3b 100644
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -217,7 +217,7 @@
           list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl))
         }
 
-        list = list.map(tuple =>
+        list.transform(tuple =>
           if (tuple._2 != FileMode.TREE)
             tuple
           else
diff --git a/src/main/scala/view/LinkConverter.scala b/src/main/scala/view/LinkConverter.scala
index 121cb2d..03f6009 100644
--- a/src/main/scala/view/LinkConverter.scala
+++ b/src/main/scala/view/LinkConverter.scala
@@ -12,7 +12,7 @@
                                  issueIdPrefix: String =  "#")(implicit context: app.Context): String = {
     value
       // escape HTML tags
-      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+      .replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
       // convert issue id to link
       .replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
         getIssue(repository.owner, repository.name, m.group(2)) match {
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 491c76d..ba17a12 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -38,7 +38,7 @@
     }
     <span class="muted">
       @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
-        comments.filter( _.action.contains("comment") ).size
+        comments.count( _.action.contains("comment") )
       ){ count =>
         @count @plural(count, "comment")
       }
@@ -89,4 +89,4 @@
     return false;
   });
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index 7254a5c..17476d1 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -14,11 +14,11 @@
           <span class="small">
             <a class="button-link@if(state == "open"){ selected}" href="?state=open">
               <img src="@assets/common/images/milestone@(if(state == "open"){"-active"}).png"/>
-              @milestones.filter(_._1.closedDate.isEmpty).size Open
+              @milestones.count(_._1.closedDate.isEmpty) Open
             </a>&nbsp;&nbsp;
             <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
               <img src="@assets/common/images/milestone@(if(state == "closed"){"-active"}).png"/>
-              @milestones.filter(_._1.closedDate.isDefined).size Closed
+              @milestones.count(_._1.closedDate.isDefined) Closed
             </a>
           </span>
         </th>
diff --git a/src/main/twirl/pulls/commits.scala.html b/src/main/twirl/pulls/commits.scala.html
index 4bf9a60..4b91f04 100644
--- a/src/main/twirl/pulls/commits.scala.html
+++ b/src/main/twirl/pulls/commits.scala.html
@@ -21,7 +21,7 @@
               @comments.get.flatMap @{
                  case comment: model.CommitComment => Some(comment)
                  case other => None
-              }.filter(_.commitId == commit.id).size
+              }.count(_.commitId == commit.id)
             }</span>
           </td>
           <td style="width: 10%; text-align: right;">