diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt b/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt
index 421828713..a4fd7f85d 100644
--- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt
+++ b/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt
@@ -29,7 +29,7 @@ data class BlockEntityType(
     val factory: BlockEntityFactory<out BlockEntity>,
 ) : RegistryItem {
 
-    fun build(connection: PlayConnection): BlockEntity? {
+    fun build(connection: PlayConnection): BlockEntity {
         return DefaultBlockEntityMetaDataFactory.buildBlockEntity(factory, connection)
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java b/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java
index 8cf32c082..ae971217b 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java
@@ -18,7 +18,6 @@ import de.bixilon.minosoft.Minosoft;
 import de.bixilon.minosoft.data.mappings.ResourceLocation;
 import de.bixilon.minosoft.data.mappings.versions.Version;
 import de.bixilon.minosoft.data.mappings.versions.Versions;
-import de.bixilon.minosoft.util.logging.LogMessageType;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
@@ -31,14 +30,12 @@ import javafx.stage.Stage;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Base64;
 
 public class GUITools {
     public static final Image MINOSOFT_LOGO = new Image(GUITools.class.getResourceAsStream("/assets/minosoft/textures/icons/window_icon.png"));
     public static final ObservableList<Version> VERSIONS = FXCollections.observableArrayList();
     public static final JFXComboBox<Version> VERSION_COMBO_BOX = new JFXComboBox<>(VERSIONS);
-    public static final ObservableList<LogMessageType> LOG_LEVELS = FXCollections.observableList(Arrays.asList(LogMessageType.values().clone()));
 
     static {
         VERSIONS.add(Versions.AUTOMATIC_VERSION);
diff --git a/src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java
index e8a66ea3b..5de21e35f 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java
@@ -13,12 +13,9 @@
 
 package de.bixilon.minosoft.gui.main;
 
-import com.jfoenix.controls.JFXComboBox;
 import de.bixilon.minosoft.data.locale.LocaleManager;
 import de.bixilon.minosoft.data.locale.Strings;
-import de.bixilon.minosoft.util.logging.LogMessageType;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 import javafx.scene.layout.GridPane;
 
@@ -27,17 +24,13 @@ import java.util.ResourceBundle;
 
 public class SettingsWindow implements Initializable {
     public GridPane tabGeneral;
-    public JFXComboBox<LogMessageType> generalLogLevel;
     public Tab general;
     public Tab download;
-    public Label generalLogLevelLabel;
 
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
-        this.generalLogLevel.setItems(GUITools.LOG_LEVELS);
 
         this.general.setText(LocaleManager.translate(Strings.SETTINGS_GENERAL));
-        this.generalLogLevelLabel.setText(LocaleManager.translate(Strings.SETTINGS_GENERAL_LOG_LEVEL));
         this.download.setText(LocaleManager.translate(Strings.SETTINGS_DOWNLOAD));
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayOutByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayOutByteBuffer.kt
index e84ab68ad..41bb3d97f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayOutByteBuffer.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayOutByteBuffer.kt
@@ -53,8 +53,8 @@ class PlayOutByteBuffer(override val connection: PlayConnection) : OutByteBuffer
             writeNBT(itemStack.nbtOut)
             return
         }
+        writeBoolean(itemStack != null)
         if (itemStack == null) {
-            writeBoolean(false)
             return
         }
         writeVarInt(connection.mapping.itemRegistry.getId(itemStack.item))