diff --git a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
index 4ca675569..e726002b2 100644
--- a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
@@ -1,6 +1,6 @@
 #include "../../Minecraft.World/Platform/stdafx.h"
 #include "SoundEngine.h"
-#include "PathHelper.h"
+#include "../../Minecraft.World/Util/PathHelper.h"
 #include "../Consoles_App.h"
 #include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp
index aca1a1f6d..77c72401e 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp
@@ -23,6 +23,7 @@
 #include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
 #include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
 #include "../Minecraft.World/Blocks/TileEntities/HopperTileEntity.h"
+#include "../Minecraft.World/Util/PathHelper.h"
 #include "../Minecraft.Client/GameState/StatsCounter.h"
 #include "../Minecraft.Client/GameState/GameMode.h"
 #include "../Minecraft.Client/Platform/Windows64/Social/SocialManager.h"
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
index 1d7b0d614..dc232054c 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -625,7 +625,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() {
         bool pccFriendsAllowed = true;
         bool bContentRestricted = false;
 
-        GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(),
+        ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),
                                             false, &pccAllowed,
                                             &pccFriendsAllowed);
 
@@ -931,7 +931,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void* pParam,
             bool pccAllowed = true;
             bool pccFriendsAllowed = true;
 
-            GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(),
+            ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),
                                                 false, &pccAllowed,
                                                 &pccFriendsAllowed);
             if (!pccAllowed && !pccFriendsAllowed) noUGC = true;
diff --git a/Minecraft.Client/Textures/BufferedImage.cpp b/Minecraft.Client/Textures/BufferedImage.cpp
index b99759037..e9ab94fde 100644
--- a/Minecraft.Client/Textures/BufferedImage.cpp
+++ b/Minecraft.Client/Textures/BufferedImage.cpp
@@ -1,7 +1,7 @@
 #include "../Platform/stdafx.h"
 #include "../../Minecraft.World/Util/StringHelpers.h"
 #include "Textures.h"
-#include "PathHelper.h"
+#include "../../Minecraft.World/Util/PathHelper.h"
 #include "../../Minecraft.World/Util/ArrayWithLength.h"
 #include "BufferedImage.h"
 #if defined(__linux__)
diff --git a/Minecraft.World/Platform/PathHelper.h b/Minecraft.World/Util/PathHelper.h
similarity index 100%
rename from Minecraft.World/Platform/PathHelper.h
rename to Minecraft.World/Util/PathHelper.h
diff --git a/subprojects/4jlibs.wrap b/subprojects/4jlibs.wrap
index ab584a950..e9e21334c 100644
--- a/subprojects/4jlibs.wrap
+++ b/subprojects/4jlibs.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/4jcraft/4jlibs.git
-revision = immediategone-v2
+revision = main
 
 [provide]
 dependency_names = 4j-render, 4j-input, 4j-profile, 4j-storage