diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java
index a16b9e91f..d2174a1bf 100644
--- a/src/main/java/com/simibubi/create/Create.java
+++ b/src/main/java/com/simibubi/create/Create.java
@@ -20,7 +20,6 @@ import com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours;
 import com.simibubi.create.content.logistics.block.mechanicalArm.AllArmInteractionPointTypes;
 import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
 import com.simibubi.create.content.palettes.AllPaletteBlocks;
-import com.simibubi.create.content.palettes.PalettesItemGroup;
 import com.simibubi.create.content.schematics.SchematicProcessor;
 import com.simibubi.create.content.schematics.ServerSchematicLoader;
 import com.simibubi.create.content.schematics.filtering.SchematicInstances;
@@ -73,7 +72,7 @@ public class Create {
 		.create();
 
 	public static final CreativeModeTab BASE_CREATIVE_TAB = new CreateItemGroup();
-	public static final CreativeModeTab PALETTES_CREATIVE_TAB = new PalettesItemGroup();
+//	public static final CreativeModeTab PALETTES_CREATIVE_TAB = new PalettesItemGroup();
 
 	public static final ServerSchematicLoader SCHEMATIC_RECEIVER = new ServerSchematicLoader();
 	public static final RedstoneLinkNetworkHandler REDSTONE_LINK_NETWORK_HANDLER = new RedstoneLinkNetworkHandler();
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java b/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
index be9098a9c..2ac88425b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
@@ -108,7 +108,7 @@ public class AllDisplayBehaviours {
 	//
 
 	public static List<DisplaySource> sourcesOf(Block block) {
-		return SOURCES_BY_BLOCK.getOrDefault(block.getRegistryName(), Collections.emptyList());
+		return SOURCES_BY_BLOCK.getOrDefault(block.delegate, Collections.emptyList());
 	}
 
 	public static List<DisplaySource> sourcesOf(BlockState state) {
@@ -116,7 +116,7 @@ public class AllDisplayBehaviours {
 	}
 
 	public static List<DisplaySource> sourcesOf(BlockEntityType<?> tileEntityType) {
-		return SOURCES_BY_TILE.getOrDefault(tileEntityType, Collections.emptyList());
+		return SOURCES_BY_TILE.getOrDefault(tileEntityType.delegate, Collections.emptyList());
 	}
 
 	public static List<DisplaySource> sourcesOf(BlockEntity tileEntity) {
diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
index 228a820b4..e249b9956 100644
--- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
+++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
@@ -31,7 +31,7 @@ import net.minecraftforge.common.Tags;
 public class AllPaletteBlocks {
 
 	private static final CreateRegistrate REGISTRATE = Create.registrate()
-		.creativeModeTab(() -> Create.PALETTES_CREATIVE_TAB)
+		.creativeModeTab(() -> Create.BASE_CREATIVE_TAB) // Change back when creative tabs in Registrate are fixed
 		.startSection(AllSections.PALETTES);
 
 	// Windows and Glass