diff --git a/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala
index 2c5571bca..2fe8f0426 100644
--- a/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala
@@ -83,7 +83,7 @@ abstract class TextureFontRenderer {
         GL11.glBegin(GL11.GL_QUADS)
         var cfg = -1
         var tx = 0f
-        for (n <- 0 until line.length) {
+        for (n <- line.indices) {
           val ch = line(n)
           val col = PackedColor.unpackForeground(color(n), format)
           // Check if color changed.
diff --git a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
index 5e7cf6583..e23073f61 100644
--- a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
@@ -16,7 +16,7 @@ object BufferRenderer {
 
   private var displayLists = 0
 
-  def init(tm: TextureManager) = this.synchronized(if (!textureManager.isDefined) {
+  def init(tm: TextureManager) = this.synchronized(if (textureManager.isEmpty) {
     RenderState.checkError(getClass.getName + ".displayLists: entering (aka: wasntme)")
 
     textureManager = Some(tm)