diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
index 86012df1f..199f2c159 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
@@ -223,7 +223,7 @@ class RenderWindow(
         // Make the OpenGL context current
         glfwMakeContextCurrent(windowId)
         // Enable v-sync
-        glfwSwapInterval(0)
+        glfwSwapInterval(1)
 
 
         // Make the window visible
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt
index 00c05ec42..2d33e8f09 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt
@@ -372,8 +372,8 @@ class WorldRenderer(
             return divided
         }
     }
-}
 
-private operator fun Int.plus(upOrDown: Directions): Int {
-    return this + upOrDown.directionVector.y.toInt()
+    private operator fun Int.plus(upOrDown: Directions): Int {
+        return this + upOrDown.directionVector.y
+    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.java b/src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.kt
similarity index 76%
rename from src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.java
rename to src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.kt
index e0f4d4345..147e29234 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.java
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.kt
@@ -10,14 +10,9 @@
  *
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
+package de.bixilon.minosoft.gui.rendering.exceptions
 
-package de.bixilon.minosoft.gui.rendering.exceptions;
-
-public class ShaderLoadingException extends Exception {
-    public ShaderLoadingException() {
-    }
-
-    public ShaderLoadingException(String message) {
-        super(message);
-    }
+class ShaderLoadingException : Exception {
+    constructor()
+    constructor(message: String) : super(message)
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt
index d25bf53a5..a9da8f92b 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt
@@ -208,8 +208,8 @@ class TextureArray(val allTextures: MutableList<Texture>) {
 
                 val arrayOffset = textureAnimation.animationProperties.animationId * INTS_PER_ANIMATED_TEXTURE
 
-                animatedData[arrayOffset] = baseAnimatedData or currentFrame.index
-                animatedData[arrayOffset + 1] = baseAnimatedData or nextFrame.index
+                animatedData[arrayOffset] = baseAnimatedData + currentFrame.index
+                animatedData[arrayOffset + 1] = baseAnimatedData + nextFrame.index
                 animatedData[arrayOffset + 2] = interpolation.toInt()
             }