diff --git a/meson.build b/meson.build
index 0e9f62b38..e98243b34 100644
--- a/meson.build
+++ b/meson.build
@@ -10,8 +10,9 @@ project(
         'warning_level=0',
         'unity=on', # merge source files per target
         'unity_size=8', # TODO: mess around with this
-        'buildtype=debugoptimized', # needed for _FORTIFY_SOURCE
+        'buildtype=debug',
         'b_pch=true', # precompiled headers
+        'default_library=static', # static linkage to subprojects
         # 'b_lto=true', # link-time optimisation (ThinLTO under clang+lld)
         # 'b_ndebug=if-release', # drop assert() in --buildtype=release
     ],
diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp
index dd251d5ab..c10d5ed82 100644
--- a/targets/app/common/Game.cpp
+++ b/targets/app/common/Game.cpp
@@ -259,11 +259,7 @@ int Game::GetLocalPlayerCount(void) {
 // Installed DLC callback
 
 // 4J-JEV: For the sake of clarity in DLCMountedCallback.
-#if defined(_WINDOWS64)
 #define CONTENT_DATA_DISPLAY_NAME(a) (a.szDisplayName)
-#else
-#define CONTENT_DATA_DISPLAY_NAME(a) (a.wszDisplayName)
-#endif
 
 #undef CONTENT_DATA_DISPLAY_NAME
 
diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h
index 0653257a4..a25cb6f0a 100644
--- a/targets/app/common/Game.h
+++ b/targets/app/common/Game.h
@@ -1202,12 +1202,6 @@ private:
     std::string getRootPath(std::uint32_t packId, bool allowOverride,
                             bool bAddDataFolder, std::string mountPoint);
 
-public:
-#if defined(_WINDOWS64)
-    // CMinecraftAudio audio;
-#else
-
-#endif
 };
 
 extern Game app;
\ No newline at end of file
diff --git a/targets/app/common/GameSettingsManager.cpp b/targets/app/common/GameSettingsManager.cpp
index 8eee1fedf..8a4b5ec8c 100644
--- a/targets/app/common/GameSettingsManager.cpp
+++ b/targets/app/common/GameSettingsManager.cpp
@@ -41,17 +41,10 @@ void GameSettingsManager::initGameSettings() {
         // clear the flag to say the settings have changed
         GameSettingsA[i]->bSettingsChanged = false;
 
-#if defined(_WINDOWS64)
         IPlatformProfile::PROFILESETTINGS* pProfileSettings =
             PlatformProfile.GetDashboardProfileSettings(i);
         memset(pProfileSettings, 0, sizeof(IPlatformProfile::PROFILESETTINGS));
         setDefaultOptions(pProfileSettings, i);
-#else
-        IPlatformProfile::PROFILESETTINGS* pProfileSettings =
-            PlatformProfile.GetDashboardProfileSettings(i);
-        memset(pProfileSettings, 0, sizeof(IPlatformProfile::PROFILESETTINGS));
-        setDefaultOptions(pProfileSettings, i);
-#endif
     }
 }
 
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index 6575211f8..274f4d487 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -1119,7 +1119,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() {
 
     delete m_currentSessions;
     m_currentSessions =
-        g_NetworkManager.GetSessionList(m_iPad, 1, m_bShowingPartyGamesOnly);
+        PlatformNetwork.GetSessionList(m_iPad, 1, m_bShowingPartyGamesOnly);
 
     // Update the xui list displayed
     unsigned int xuiListSize = m_buttonListGames.getItemCount();
diff --git a/targets/java/include/java/Class.h b/targets/java/include/java/Class.h
index ce61e1bcf..c0d45ecf0 100644
--- a/targets/java/include/java/Class.h
+++ b/targets/java/include/java/Class.h
@@ -350,7 +350,7 @@ inline bool eTYPE_FLAGSET(eINSTANCEOF flag, eINSTANCEOF claz) {
 
 /// FOR CHECKING ///
 
-#if !(defined _WINDOWS64)
+#if 1
 
 class SubClass {
     static void checkDerivations() {}
diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp
index 1e2ce80b5..08786db76 100644
--- a/targets/java/src/File.cpp
+++ b/targets/java/src/File.cpp
@@ -122,9 +122,8 @@ File::File(const std::string& pathname) {
 File::File(const std::string& parent,
            const std::string& child)  //: m_abstractPathName( child  )
 {
-    m_abstractPathName =
-        pathRoot + pathSeparator + parent + pathSeparator + child;
-    // this->parent = new File( parent );
+    // Using std::filesystem::path to join paths properly
+    m_abstractPathName = (std::filesystem::path(parent) / child).string();
 }
 
 // Creates a new File instance by converting the given path vector into an
diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h
index f2b496abb..d948d23a2 100644
--- a/targets/minecraft/client/renderer/LevelRenderer.h
+++ b/targets/minecraft/client/renderer/LevelRenderer.h
@@ -68,13 +68,8 @@ public:
     static const int CHUNK_SIZE = 16;
 #endif
     static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE;
-#if defined(_WINDOWS64)
     static const int MAX_COMMANDBUFFER_ALLOCATIONS =
         512 * 1024 * 1024;  // 4J - added
-#else
-    static const int MAX_COMMANDBUFFER_ALLOCATIONS =
-        55 * 1024 * 1024;  // 4J - added
-#endif
 public:
     LevelRenderer(Minecraft* mc, Textures* textures);
 
diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp
index 0556f936c..67d849d01 100644
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@@ -33,9 +33,6 @@
 #include "platform/storage/storage.h"
 #include "util/StringHelpers.h"
 
-#if defined(_WINDOWS64)
-#endif
-
 namespace {
 bool ReadPortableBinaryFile(File& file, std::uint8_t*& data,
                             unsigned int& size) {