diff --git a/src/main/java/de/bixilon/minosoft/data/registries/item/items/pixlyzer/PixLyzerItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/item/items/pixlyzer/PixLyzerItem.kt
index 9fa14234b..f84d2d8f6 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/item/items/pixlyzer/PixLyzerItem.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/item/items/pixlyzer/PixLyzerItem.kt
@@ -47,7 +47,9 @@ open class PixLyzerItem(resourceLocation: ResourceLocation, registries: Registri
             val className = data["class"]?.toString()
             var factory = PixLyzerItemFactories[className]
             if (factory == null) {
-                Log.log(LogMessageType.LOADING, LogLevels.VERBOSE) { "Item for class $className not found, defaulting..." }
+                if (className != null) {
+                    Log.log(LogMessageType.LOADING, LogLevels.VERBOSE) { "Item for class $className not found, defaulting..." }
+                }
                 // ToDo: This item class got renamed or is not yet implemented
                 factory = if (data["food_properties"] != null) {
                     PixLyzerFoodItem // ToDo: Remove this edge case
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt
index ebd756dfd..fe0194473 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt
@@ -27,12 +27,12 @@ class LavaFluidModel : FluidModel {
     override val transparency = TextureTransparencies.OPAQUE// TODO: from texture
 
     override fun load(context: RenderContext) {
-        still = context.textures.staticTextures.createTexture(context.models.block.fixPath(STILL).texture())
-        flowing = context.textures.staticTextures.createTexture(context.models.block.fixPath(FLOWING).texture())
+        still = context.textures.staticTextures.createTexture(context.models.block.fixTexturePath(STILL).texture())
+        flowing = context.textures.staticTextures.createTexture(context.models.block.fixTexturePath(FLOWING).texture())
     }
 
     companion object {
-        private val STILL = minecraft("block/lava_still").texture()
-        private val FLOWING = minecraft("block/lava_flow").texture()
+        private val STILL = minecraft("block/lava_still")
+        private val FLOWING = minecraft("block/lava_flow")
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt
index d999de440..050730232 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt
@@ -31,8 +31,8 @@ class WaterFluidModel : FluidModel {
     override val transparency = TextureTransparencies.TRANSLUCENT// TODO: from texture
 
     override fun load(context: RenderContext) {
-        still = context.textures.staticTextures.createTexture(context.models.block.fixPath(STILL).texture())
-        flowing = context.textures.staticTextures.createTexture(context.models.block.fixPath(FLOWING).texture())
+        still = context.textures.staticTextures.createTexture(context.models.block.fixTexturePath(STILL).texture())
+        flowing = context.textures.staticTextures.createTexture(context.models.block.fixTexturePath(FLOWING).texture())
     }
 
     companion object {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/BlockLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/BlockLoader.kt
index f4b1f60a4..6e31e6807 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/BlockLoader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/BlockLoader.kt
@@ -74,12 +74,12 @@ class BlockLoader(private val loader: ModelLoader) {
         this.cache.clear()
     }
 
-    fun fixPath(name: ResourceLocation): ResourceLocation {
-        return ResourceLocation(name.namespace, name.path.fixPrefix(loader.packFormat, 4, "block/", "blocks/"))
+    fun fixTexturePath(name: ResourceLocation): ResourceLocation {
+        return ResourceLocation(name.namespace, name.path.fixPrefix(loader.packFormat, 4, "blocks/", "block/"))
     }
 
     private fun ResourceLocation.blockModel(): ResourceLocation {
-        return fixPath(this).model()
+        return this.prefix("block/").model()
     }
 
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt
index 2e869af8f..0707253a1 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/loader/ItemLoader.kt
@@ -73,11 +73,11 @@ class ItemLoader(private val loader: ModelLoader) {
         this.cache.clear()
     }
 
-    fun fixPath(name: ResourceLocation): ResourceLocation {
-        return ResourceLocation(name.namespace, name.path.fixPrefix(loader.packFormat, 4, "item/", "items/"))
+    fun fixTexturePath(name: ResourceLocation): ResourceLocation {
+        return ResourceLocation(name.namespace, name.path.fixPrefix(loader.packFormat, 4, "items/", "item/"))
     }
 
     private fun ResourceLocation.itemModel(): ResourceLocation {
-        return fixPath(this).model()
+        return this.prefix("item/").model()
     }
 }