diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5300f78ec..3d52dd0ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala
index 5b4835c1a..b483c4161 100644
--- a/src/main/scala/li/cil/oc/Settings.scala
+++ b/src/main/scala/li/cil/oc/Settings.scala
@@ -264,13 +264,13 @@ object Settings {
     // reportedly fixed the problem.
     val defaults = {
       val in = classOf[Settings].getResourceAsStream("/reference.conf")
-      val config = Source.fromInputStream(in).mkString.replace("\r\n", "\n")
+      val config = Source.fromInputStream(in)("UTF-8").getLines().mkString("", "\n", "")
       in.close()
       ConfigFactory.parseString(config)
     }
     val config =
       try {
-        val plain = Source.fromFile(file).mkString.replace("\r\n", "\n")
+        val plain = Source.fromFile(file)("UTF-8").getLines().mkString("", "\n", "")
         val config = patchConfig(ConfigFactory.parseString(plain), defaults).withFallback(defaults)
         settings = new Settings(config.getConfig("opencomputers"))
         config
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala b/src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
index ba0a0dc7b..781a025d5 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
@@ -13,7 +13,7 @@ class Geolyzer extends traits.Environment {
 
   override def canUpdate = false
 
-  @Callback(doc = """function(x:number, z:number[, ignoreReplaceable:boolean) -- Analyzes the density of the column at the specified relative coordinates.""")
+  @Callback(doc = """function(x:number, z:number[, ignoreReplaceable:boolean]):table -- Analyzes the density of the column at the specified relative coordinates.""")
   def scan(computer: Context, args: Arguments): Array[AnyRef] = {
     val rx = args.checkInteger(0)
     val rz = args.checkInteger(1)