diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt
index c4fe2806..2873c7f5 100644
--- a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt
@@ -37,7 +37,7 @@ abstract class BuildGenerator : IInitContributor<File> {
         }
 
         val properties = pom.properties
-        val mapped = properties.entries.toMap({it.key}, { ProjectGenerator.toIdentifier(it.key) })
+        val mapped = properties.entries.toMapBy({ it.key }, { ProjectGenerator.toIdentifier(it.key) })
 
         map.put("properties", properties.entries.map({ Pair(mapped[it.key], it.value) }))
 
diff --git a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
index d59ee2f3..e53be3bf 100644
--- a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
@@ -15,6 +15,7 @@ import java.net.URL
 import java.nio.charset.Charset
 import java.nio.file.Paths
 import java.util.*
+import kotlin.text.Regex
 
 class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val buildScriptUtil: BuildScriptUtil,
         val dependencyManager: DependencyManager, val files: KFiles) {
diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
index 793a7a5a..b653356d 100644
--- a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
@@ -77,7 +77,7 @@ public class KobaltServer @Inject constructor(val args: Args) : Runnable, IComma
     private fun runCommand(jo: JsonObject) {
         val command = jo.get("name").asString
         if (command != null) {
-            COMMANDS.getOrElse(command, { COMMANDS.get("ping") })!!.run(this, jo)
+            (COMMANDS[command] ?: COMMANDS["ping"])!!.run(this, jo)
         } else {
             error("Did not find a name in command: $jo")
         }
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
index 4dc696de..22237a81 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
@@ -69,7 +69,7 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
     }
 
     private fun uploadGithub(project: Project) : TaskResult {
-        val configuration = githubConfigurations.getRaw(project.name)
+        val configuration = githubConfigurations[project.name]
 
         //
         // Upload individual files, if applicable
@@ -93,7 +93,7 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
 
         val jcenter = jcenterFactory.create(user, password)
         var success = false
-        val configuration = jcenterConfigurations.getRaw(project.name)
+        val configuration = jcenterConfigurations[project.name]
         val messages = arrayListOf<String>()
 
         if (configuration != null) {